mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Added guards in case autoupdate feature is disabled.

Browse Source
This commit is contained in:
Sanel Zukan
2012-08-06 14:57:20 +00:00
parent 1dde9f92da
commit 89ec43af74
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ede-panel/applets/start-menu/StartMenu.cpp
View File

@@ -196,7 +196,7 @@ void StartMenu::popup(void) {
Fl::release_widget_pointer(mb); Fl::release_widget_pointer(mb);
menu_opened = false; menu_opened = false;
#ifdef EDE_PANEL_MENU_AUTOUPDATE
/* if we have menu that wants to be updated, swap them as soon as menu window was closed */ /* if we have menu that wants to be updated, swap them as soon as menu window was closed */
if(mcontent_pending) { if(mcontent_pending) {
XdgMenuContent *tmp = mcontent; XdgMenuContent *tmp = mcontent;
@@ -208,6 +208,7 @@ void StartMenu::popup(void) {
xdg_menu_delete(mcontent_pending); xdg_menu_delete(mcontent_pending);
mcontent_pending = NULL; mcontent_pending = NULL;
} }
#endif
} }
int StartMenu::handle(int e) { int StartMenu::handle(int e) {
@@ -289,8 +290,8 @@ bool StartMenu::can_reload(void) {
} }
void StartMenu::reload_menu(void) { void StartMenu::reload_menu(void) {
#ifdef EDE_PANEL_MENU_AUTOUPDATE
if(menu_opened) { if(menu_opened) {
E_DEBUG("pending...\n");
mcontent_pending = xdg_menu_load(); mcontent_pending = xdg_menu_load();
} else { } else {
xdg_menu_delete(mcontent); xdg_menu_delete(mcontent);
@@ -298,6 +299,7 @@ void StartMenu::reload_menu(void) {
mcontent = xdg_menu_load(); mcontent = xdg_menu_load();
setup_menu(mcontent); setup_menu(mcontent);
} }
#endif
} }
EDE_PANEL_APPLET_EXPORT ( EDE_PANEL_APPLET_EXPORT (