diff options
| author | Brian Tarricone <brian@tarricone.org> | 2004-05-03 08:37:13 +0000 |
|---|---|---|
| committer | Brian Tarricone <brian@tarricone.org> | 2004-05-03 08:37:13 +0000 |
| commit | 1ca93458d140c94e94110aeb6bc27c5fe24387fb (patch) | |
| tree | 4deb8d5302a5c62aeda6a9aa2cd65538f24ac834 /common | |
| parent | 658082e9f2a92e9d8451f477792e2bbddced4154 (diff) | |
| download | xfdesktop-1ca93458d140c94e94110aeb6bc27c5fe24387fb.tar.gz | |
* remove useless and hacky function from desktop-menu-stub
* add "show menu icons" option to panel plugin
(Old svn revision: 7698)
Diffstat (limited to 'common')
| -rw-r--r-- | common/desktop-menu-stub.c | 17 | ||||
| -rw-r--r-- | common/desktop-menu-stub.h | 1 |
2 files changed, 3 insertions, 15 deletions
diff --git a/common/desktop-menu-stub.c b/common/desktop-menu-stub.c index bcd7e928..2c301899 100644 --- a/common/desktop-menu-stub.c +++ b/common/desktop-menu-stub.c @@ -106,23 +106,12 @@ xfce_desktop_menu_stub_init() void xfce_desktop_menu_stub_cleanup(GModule *menu_gmod) { - g_return_if_fail(menu_gmod != NULL); + g_return_if_fail(menu_gmod != NULL && refcnt > 0); - if(g_module_close(menu_gmod)) - refcnt--; - if(refcnt <= 0) { + if(--refcnt <= 0) { + g_module_close(menu_gmod); menu_gmod = NULL; refcnt = 0; } } - -void -xfce_desktop_menu_stub_cleanup_all(GModule *menu_gmod) -{ - g_return_if_fail(menu_gmod != NULL); - - while(refcnt--) - g_module_close(menu_gmod); - menu_gmod = NULL; -} diff --git a/common/desktop-menu-stub.h b/common/desktop-menu-stub.h index cb3e61bd..4f9a62c1 100644 --- a/common/desktop-menu-stub.h +++ b/common/desktop-menu-stub.h @@ -29,7 +29,6 @@ extern "C" { GModule *xfce_desktop_menu_stub_init(); void xfce_desktop_menu_stub_cleanup(GModule *menu_gmod); -void xfce_desktop_menu_stub_cleanup_all(GModule *menu_gmod); /* convenience defines */ #define xfce_desktop_menu_new(menu_file, deferred) (*xfce_desktop_menu_new_p)(menu_file, deferred) |