From: "Rodolfo García Peñas (kix)" <[email protected]>
The argument WScreen was not longer used, so can be removed.
---
src/defaults.h | 2 +-
src/session.c | 2 +-
src/wdefaults.c | 4 ++--
src/window.c | 5 ++---
src/winspector.c | 4 ++--
src/workspace.c | 2 +-
src/workspace.h | 2 +-
7 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/defaults.h b/src/defaults.h
index ace6b96..767c534 100644
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -51,7 +51,7 @@ char *get_icon_filename(const char *winstance, const char
*wclass, const char *c
Bool default_icon);
-int wDefaultGetStartWorkspace(WScreen *scr, const char *instance, const char
*class);
+int wDefaultGetStartWorkspace(const char *instance, const char *class);
void wDefaultChangeIcon(WScreen *scr, const char *instance, const char* class,
const char *file);
RImage *get_rimage_from_file(WScreen *scr, const char *file_name, int
max_size);
diff --git a/src/session.c b/src/session.c
index e0b9579..f7f5f3f 100644
--- a/src/session.c
+++ b/src/session.c
@@ -555,7 +555,7 @@ void wSessionRestoreLastWorkspace(WScreen * scr)
WMPLSetCaseSensitive(False);
/* Get the workspace number for the workspace name */
- w = wGetWorkspaceNumber(scr, value);
+ w = wGetWorkspaceNumber(value);
if (w != w_global.workspace.current && w < w_global.workspace.count)
wWorkspaceChange(scr, w);
diff --git a/src/wdefaults.c b/src/wdefaults.c
index a181832..c663a1b 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -479,7 +479,7 @@ RImage *get_icon_image(WScreen *scr, const char *winstance,
const char *wclass,
return get_rimage_from_file(scr, file_name, max_size);
}
-int wDefaultGetStartWorkspace(WScreen *scr, const char *instance, const char
*class)
+int wDefaultGetStartWorkspace(const char *instance, const char *class)
{
WMPropList *value;
int w;
@@ -502,7 +502,7 @@ int wDefaultGetStartWorkspace(WScreen *scr, const char
*instance, const char *cl
return -1;
/* Get the workspace number for the workspace name */
- w = wGetWorkspaceNumber(scr, tmp);
+ w = wGetWorkspaceNumber(tmp);
return w;
}
diff --git a/src/window.c b/src/window.c
index df7e6ca..552b6f6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -833,8 +833,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
wwin->flags.miniaturized =
win_state->state->miniaturized;
if (!IS_OMNIPRESENT(wwin)) {
- int w = wDefaultGetStartWorkspace(scr,
wwin->wm_instance,
- wwin->wm_class);
+ int w = wDefaultGetStartWorkspace(wwin->wm_instance,
wwin->wm_class);
if (w < 0 || w >= w_global.workspace.count) {
workspace = win_state->state->workspace;
if (workspace >= w_global.workspace.count)
@@ -911,7 +910,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
} else {
int w;
- w = wDefaultGetStartWorkspace(scr, wwin->wm_instance,
wwin->wm_class);
+ w = wDefaultGetStartWorkspace(wwin->wm_instance,
wwin->wm_class);
if (w >= 0 && w < w_global.workspace.count &&
!(IS_OMNIPRESENT(wwin))) {
workspace = w;
diff --git a/src/winspector.c b/src/winspector.c
index fd2a1ba..b32ddca 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -928,7 +928,7 @@ static void revertSettings(WMButton *button, InspectorPanel
*panel)
showIconFor(WMWidgetScreen(panel->alwChk), panel, wm_instance,
wm_class, REVERT_TO_DEFAULT);
- n = wDefaultGetStartWorkspace(wwin->screen_ptr, wm_instance, wm_class);
+ n = wDefaultGetStartWorkspace(wm_instance, wm_class);
if (n >= 0 && n < w_global.workspace.count)
WMSetPopUpButtonSelectedItem(panel->wsP, n + 1);
@@ -1529,7 +1529,7 @@ static void create_tab_icon_workspace(WWindow *wwin,
InspectorPanel *panel, int
for (i = 0; i < w_global.workspace.count; i++)
WMAddPopUpButtonItem(panel->wsP,
w_global.workspace.array[i]->name);
- i = wDefaultGetStartWorkspace(wwin->screen_ptr, wwin->wm_instance,
wwin->wm_class);
+ i = wDefaultGetStartWorkspace(wwin->wm_instance, wwin->wm_class);
if (i >= 0 && i <= w_global.workspace.count)
WMSetPopUpButtonSelectedItem(panel->wsP, i + 1);
else
diff --git a/src/workspace.c b/src/workspace.c
index d02e9f7..405aaa1 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -913,7 +913,7 @@ void wWorkspaceRestoreState(WScreen *scr)
}
/* Returns the workspace number for a given workspace name */
-int wGetWorkspaceNumber(WScreen *scr, const char *value)
+int wGetWorkspaceNumber(const char *value)
{
int w, i;
diff --git a/src/workspace.h b/src/workspace.h
index 1304607..2398989 100644
--- a/src/workspace.h
+++ b/src/workspace.h
@@ -31,7 +31,7 @@ typedef struct WWorkspace {
void wWorkspaceMake(WScreen *scr, int count);
int wWorkspaceNew(WScreen *scr);
-int wGetWorkspaceNumber(WScreen *scr, const char *value);
+int wGetWorkspaceNumber(const char *value);
Bool wWorkspaceDelete(WScreen *scr, int workspace);
void wWorkspaceChange(WScreen *scr, int workspace);
void wWorkspaceForceChange(WScreen *scr, int workspace);
--
1.7.10.4
--
To unsubscribe, send mail to [email protected].
