[Pkg-wmaker-commits] [wmaker] 11/21: Enable usermenu

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch next
in repository wmaker.

commit 97189ce2cccbffa6af9aa824e52a375dcfa415a0
Author: Rodolfo García Peñas (kix) <kix at kix.es>
Date:   Tue Aug 25 09:41:53 2015 +0200

    Enable usermenu
    
    This patch enables the usermenu when the application is launched
    and the usermenu file exists.
    
    Signed-off-by: Rodolfo García Peñas (kix) <kix at kix.es>
---
 src/actions.c     | 1 +
 src/application.c | 2 ++
 2 files changed, 3 insertions(+)

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 */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git