This patch makes the createApplicationMenu screen independent. The screen mapping is moved to the function openApplicationMenu(), just after the call to createApplicationMenu().
Signed-off-by: Rodolfo García Peñas (kix) <[email protected]> --- src/appicon.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/appicon.c b/src/appicon.c index f61ae0e..f89eb1b 100644 --- a/src/appicon.c +++ b/src/appicon.c @@ -597,11 +597,12 @@ static void killCallback(WMenu * menu, WMenuEntry * entry) WCHANGE_STATE(WSTATE_NORMAL); } -static WMenu *createApplicationMenu(WScreen *scr) +static WMenu *createApplicationMenu(void) { WMenu *menu; - menu = wMenuCreate(scr, NULL, False); + menu = menu_create(NULL, False); + wMenuAddCallback(menu, _("Unhide Here"), unhideHereCallback, NULL); wMenuAddCallback(menu, _("Hide"), hideCallback, NULL); wMenuAddCallback(menu, _("Launch"), relaunchCallback, NULL); @@ -611,14 +612,15 @@ static WMenu *createApplicationMenu(WScreen *scr) return menu; } -static void openApplicationMenu(WApplication * wapp, int x, int y) +static void openApplicationMenu(WApplication *wapp, int x, int y) { WMenu *menu; WScreen *scr = wapp->main_window_desc->screen_ptr; int i; if (!scr->icon_menu) { - scr->icon_menu = createApplicationMenu(scr); + scr->icon_menu = createApplicationMenu(); + menu_map(scr->icon_menu, scr); wfree(scr->icon_menu->entries[1]->text); } -- 1.8.4.rc3 -- To unsubscribe, send mail to [email protected].
