This patch enables the usermenu when the application is launched
and the usermenu file exists.
The usermenu folder is ~/GNUstep/Defaults/UserMenus and was wrong
in the code.
Signed-off-by: Rodolfo García Peñas (kix) <k...@kix.es>
---
src/actions.c | 1 +
src/application.c | 2 ++
src/wconfig.h.in | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/actions.c b/src/actions.c
index 5adfab4..b210888 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -225,6 +225,7 @@ void wSetFocusTo(WScreen *scr, WWindow *wwin)
wUserMenuRefreshInstances(napp->menu, wwin);
#endif /* USER_MENU */
+ /* kix: Only menu map with mouse, not alt+tab! */
if (wwin->flags.mapped)
wAppMenuMap(napp->menu, wwin);
}
diff --git a/src/application.c b/src/application.c
index c43df04..6ff3d3f 100644
--- a/src/application.c
+++ b/src/application.c
@@ -129,6 +129,8 @@ WApplication *wApplicationCreate(WWindow * wwin)
#ifdef USER_MENU
if (!wapp->menu)
wapp->menu = wUserMenuGet(scr, wapp->main_window_desc);
+
+ wAppMenuMap(wapp->menu, wwin);
#endif
/* Set application wide attributes from the leader */
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index bac5072..cd90115 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -141,7 +141,7 @@
#ifdef USER_MENU
#define GLOBAL_USER_MENU_PATH PKGDATADIR"/UserMenus"
#define DEF_USER_MENU_PATHS \
- "~/GNUstep/Library/WindowMaker/UserMenus:"GLOBAL_USER_MENU_PATH
+ "~/GNUstep/Defaults/UserMenus:"GLOBAL_USER_MENU_PATH
#endif
/* icon path */
--
2.5.0
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
