From: Rodolfo García Peñas (kix) <[email protected]> The WScreen arguments in the functions wWorkspaceMenuUpdate() and makeMakeShortcutMenu() is not used now, so can be removed.
Signed-off-by: Rodolfo García Peñas (kix) <[email protected]> --- src/defaults.c | 4 ++-- src/dock.c | 2 +- src/rootmenu.c | 2 +- src/winmenu.c | 19 ++----------------- src/workspace.c | 14 +++++++------- src/workspace.h | 2 +- 6 files changed, 14 insertions(+), 29 deletions(-) diff --git a/src/defaults.c b/src/defaults.c index 0cceb37..2b2a1ed 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -1203,9 +1203,9 @@ void wReadDefaults(WScreen * scr, WMPropList * new_dict) if (needs_refresh & REFRESH_WORKSPACE_MENU) { if (w_global.workspace.menu) - wWorkspaceMenuUpdate(scr, w_global.workspace.menu); + wWorkspaceMenuUpdate(w_global.workspace.menu); if (w_global.clip.ws_menu) - wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu); + wWorkspaceMenuUpdate(w_global.clip.ws_menu); if (w_global.workspace.submenu) w_global.workspace.submenu->flags.realized = 0; if (w_global.clip.submenu) diff --git a/src/dock.c b/src/dock.c index aa7c57d..3606e82 100644 --- a/src/dock.c +++ b/src/dock.c @@ -3965,7 +3965,7 @@ static void iconMouseDown(WObjDescriptor *desc, XEvent *event) WMenu *wsMenu = w_global.clip.ws_menu; int xpos; - wWorkspaceMenuUpdate(scr, wsMenu); + wWorkspaceMenuUpdate(wsMenu); xpos = event->xbutton.x_root - wsMenu->frame->core->width / 2 - 1; if (xpos < 0) { diff --git a/src/rootmenu.c b/src/rootmenu.c index ad7ca11..071c63d 100644 --- a/src/rootmenu.c +++ b/src/rootmenu.c @@ -780,7 +780,7 @@ static WMenuEntry *addWorkspaceMenu(WScreen *scr, WMenu *menu, const char *title entry = wMenuAddCallback(menu, title, NULL, NULL); wMenuEntrySetCascade(menu, entry, wsmenu); - wWorkspaceMenuUpdate(scr, wsmenu); + wWorkspaceMenuUpdate(wsmenu); } return entry; } diff --git a/src/winmenu.c b/src/winmenu.c index 1266edf..62e9314 100644 --- a/src/winmenu.c +++ b/src/winmenu.c @@ -356,19 +356,9 @@ static WMenu *makeWorkspaceMenu(WScreen * scr) return menu; } -static WMenu *makeMakeShortcutMenu(WScreen * scr, WMenu * menu) +static WMenu *makeMakeShortcutMenu(WMenu *menu) { - /* - WMenu *menu; - */ int i; - /* - menu = wMenuCreate(scr, NULL, False); - if (!menu) { - wwarning(_("could not create submenu for window menu")); - return NULL; - } - */ for (i = 0; i < MAX_WINDOW_SHORTCUTS; i++) { WMenuEntry *entry; @@ -443,12 +433,7 @@ static WMenu *createWindowMenu(WScreen * scr) entry = wMenuAddCallback(menu, _("Attributes..."), execMenuCommand, NULL); entry = wMenuAddCallback(menu, _("Options"), NULL, NULL); - wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr, makeOptionsMenu(scr))); - - /* - entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); - wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); - */ + wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(makeOptionsMenu(scr))); entry = wMenuAddCallback(menu, _("Launch"), execMenuCommand, NULL); entry->rtext = GetShortcutKey(wKeyBindings[WKBD_RELAUNCH]); diff --git a/src/workspace.c b/src/workspace.c index d34b555..4d1b301 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -114,8 +114,8 @@ int wWorkspaceNew(WScreen *scr) w_global.workspace.array = list; - wWorkspaceMenuUpdate(scr, w_global.workspace.menu); - wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu); + wWorkspaceMenuUpdate(w_global.workspace.menu); + wWorkspaceMenuUpdate(w_global.clip.ws_menu); wNETWMUpdateDesktop(scr); WMPostNotificationName(WMNWorkspaceCreated, scr, (void *)(uintptr_t) (w_global.workspace.count - 1)); XFlush(dpy); @@ -165,9 +165,9 @@ Bool wWorkspaceDelete(WScreen * scr, int workspace) w_global.workspace.count--; /* update menu */ - wWorkspaceMenuUpdate(scr, w_global.workspace.menu); + wWorkspaceMenuUpdate(w_global.workspace.menu); /* clip workspace menu */ - wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu); + wWorkspaceMenuUpdate(w_global.clip.ws_menu); /* update also window menu */ if (w_global.workspace.submenu) { @@ -482,9 +482,9 @@ void wWorkspaceForceChange(WScreen * scr, int workspace) w_global.workspace.last_used = w_global.workspace.current; w_global.workspace.current = workspace; - wWorkspaceMenuUpdate(scr, w_global.workspace.menu); + wWorkspaceMenuUpdate(w_global.workspace.menu); - wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu); + wWorkspaceMenuUpdate(w_global.clip.ws_menu); toUnmapSize = 16; toUnmapCount = 0; @@ -737,7 +737,7 @@ WMenu *wWorkspaceMenuMake(WScreen * scr, Bool titled) return wsmenu; } -void wWorkspaceMenuUpdate(WScreen * scr, WMenu * menu) +void wWorkspaceMenuUpdate(WMenu *menu) { int i; long ws; diff --git a/src/workspace.h b/src/workspace.h index 69d1b18..1304607 100644 --- a/src/workspace.h +++ b/src/workspace.h @@ -36,7 +36,7 @@ Bool wWorkspaceDelete(WScreen *scr, int workspace); void wWorkspaceChange(WScreen *scr, int workspace); void wWorkspaceForceChange(WScreen *scr, int workspace); WMenu *wWorkspaceMenuMake(WScreen *scr, Bool titled); -void wWorkspaceMenuUpdate(WScreen *scr, WMenu *menu); +void wWorkspaceMenuUpdate(WMenu *menu); void wWorkspaceMenuEdit(WScreen *scr); void wWorkspaceSaveState(WScreen *scr, WMPropList *old_state); void wWorkspaceRestoreState(WScreen *scr); -- 1.8.4.rc3 -- To unsubscribe, send mail to [email protected].
