This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 5a16cb8e020063f1c199ca0d930f04ceb5d506ff (commit)
via f3e3ddf4f252e4a8b745c667df75f760e620e3dc (commit)
via b7ae1b50e28ebc2a4d16f28ea51779c9380d66d6 (commit)
via 6ad22c867281a427fd5aedc3dc1a1ae5c6021b03 (commit)
via 803eb68fc40752a4ef40295ebaff1256c0b6d62b (commit)
via fd869154c655d16160712324d2b565829f7e2377 (commit)
via 9c6e71ead02ca688f02d6a0d84c4591611e445ca (commit)
from 3b85fca43cce31278662622222c37f2c4479510d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/5a16cb8e020063f1c199ca0d930f04ceb5d506ff
commit 5a16cb8e020063f1c199ca0d930f04ceb5d506ff
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 15:35:52 2013 +0200
Removed unused WScreen argument in some Default handling functions
diff --git a/src/appicon.c b/src/appicon.c
index ee6aed6..6a6e4fd 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -533,7 +533,7 @@ static void setIconCallback(WMenu *menu, WMenuEntry *entry)
wMessageDialog(scr, _("Error"),
_("Could not open specified icon file"),
_("OK"), NULL, NULL);
} else {
- wDefaultChangeIcon(scr, icon->wm_instance,
icon->wm_class, file);
+ wDefaultChangeIcon(icon->wm_instance, icon->wm_class,
file);
wAppIconPaint(icon);
}
if (file)
diff --git a/src/defaults.h b/src/defaults.h
index 767c534..3712038 100644
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -52,9 +52,9 @@ char *get_icon_filename(const char *winstance, const char
*wclass, const char *c
int wDefaultGetStartWorkspace(const char *instance, const char *class);
-void wDefaultChangeIcon(WScreen *scr, const char *instance, const char* class,
const char *file);
+void wDefaultChangeIcon(const char *instance, const char* class, const char
*file);
RImage *get_rimage_from_file(WScreen *scr, const char *file_name, int
max_size);
-void wDefaultPurgeInfo(WScreen *scr, const char *instance, const char *class);
+void wDefaultPurgeInfo(const char *instance, const char *class);
#endif /* WMDEFAULTS_H_ */
diff --git a/src/dock.c b/src/dock.c
index ef45d3e..c652e14 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -4353,7 +4353,7 @@ static void drawerDestroy(WDock *drawer)
/* Note regarding menus: we can't delete any dock/clip/drawer menu,
because
* that would (attempt to) wfree some memory in gettext library (see
menu
* entries that have several "versions", such like "Hide" and
"Unhide"). */
- wDefaultPurgeInfo(scr, drawer->icon_array[0]->wm_instance,
+ wDefaultPurgeInfo(drawer->icon_array[0]->wm_instance,
drawer->icon_array[0]->wm_class);
if (drawer->icon_count == 2) {
diff --git a/src/dockedapp.c b/src/dockedapp.c
index a8ea024..cc7292f 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -184,7 +184,7 @@ static void panelBtnCallback(WMWidget * self, void *data)
else
wAppIconPaint(aicon);
- wDefaultChangeIcon(panel->wwin->screen_ptr,
aicon->wm_instance, aicon->wm_class, text);
+ wDefaultChangeIcon(aicon->wm_instance, aicon->wm_class,
text);
}
if (text)
wfree(text);
diff --git a/src/wdefaults.c b/src/wdefaults.c
index c663a1b..24d2598 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -529,7 +529,7 @@ char *wDefaultGetIconFile(const char *instance, const char
*class, Bool default_
return tmp;
}
-void wDefaultChangeIcon(WScreen *scr, const char *instance, const char *class,
const char *file)
+void wDefaultChangeIcon(const char *instance, const char *class, const char
*file)
{
WDDomain *db = w_global.domain.window_attr;
WMPropList *icon_value = NULL, *value, *attr, *key, *def_win, *def_icon
= NULL;
@@ -593,7 +593,7 @@ void wDefaultChangeIcon(WScreen *scr, const char *instance,
const char *class, c
WMPLSetCaseSensitive(False);
}
-void wDefaultPurgeInfo(WScreen *scr, const char *instance, const char *class)
+void wDefaultPurgeInfo(const char *instance, const char *class)
{
WMPropList *value, *key, *dict;
char *buffer;
http://repo.or.cz/w/wmaker-crm.git/commit/f3e3ddf4f252e4a8b745c667df75f760e620e3dc
commit f3e3ddf4f252e4a8b745c667df75f760e620e3dc
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 15:35:51 2013 +0200
Removed unused WScreen argument in dock's clip function
diff --git a/src/defaults.c b/src/defaults.c
index 0fb2bbc..f4af21d 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -2485,7 +2485,7 @@ static int setIconTile(WScreen * scr, WDefaultEntry *
entry, void *tdata, void *
if (scr->clip_tile) {
RReleaseImage(scr->clip_tile);
}
- scr->clip_tile = wClipMakeTile(scr, img);
+ scr->clip_tile = wClipMakeTile(img);
}
if (!wPreferences.flags.nodrawer) {
diff --git a/src/dock.c b/src/dock.c
index 2af999a..ef45d3e 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -365,7 +365,7 @@ static void paintClipButtons(WAppIcon *clipIcon, Bool
lpushed, Bool rpushed)
}
}
-RImage *wClipMakeTile(WScreen *scr, RImage *normalTile)
+RImage *wClipMakeTile(RImage *normalTile)
{
RImage *tile = RCloneImage(normalTile);
RColor black;
diff --git a/src/dock.h b/src/dock.h
index e7dd2c2..f3a59b2 100644
--- a/src/dock.h
+++ b/src/dock.h
@@ -108,7 +108,7 @@ int wIsADrawer(WAppIcon *aicon);
void wClipUpdateForWorkspaceChange(WScreen *scr, int workspace);
-RImage *wClipMakeTile(WScreen *scr, RImage *normalTile);
+RImage *wClipMakeTile(RImage *normalTile);
RImage* wDrawerMakeTile(WScreen *scr, RImage *normalTile);
#define WO_FAILED 0
http://repo.or.cz/w/wmaker-crm.git/commit/b7ae1b50e28ebc2a4d16f28ea51779c9380d66d6
commit b7ae1b50e28ebc2a4d16f28ea51779c9380d66d6
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 15:35:50 2013 +0200
Removed unused WScreen argument in dock's drawer state functions
It was used to access the session state, which was stored in the
screen scruct, which is now more logically in the global namespace.
diff --git a/src/dock.c b/src/dock.c
index 2385700..2af999a 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -4829,7 +4829,7 @@ finish:
/* Same kind of comment than for previous function: this function is
* very similar to make_icon_state, but has substential differences as
* well. */
-static WMPropList *drawerSaveState(WScreen *scr, WDock *drawer)
+static WMPropList *drawerSaveState(WDock *drawer)
{
WMPropList *pstr, *drawer_state;
WAppIcon *ai;
@@ -4884,7 +4884,7 @@ void wDrawersSaveState(WScreen *scr)
for (i=0, dc = scr->drawers;
i < scr->drawer_count;
i++, dc = dc->next) {
- drawer_state = drawerSaveState(scr, dc->adrawer);
+ drawer_state = drawerSaveState(dc->adrawer);
WMAddToPLArray(all_drawers, drawer_state);
WMReleasePropList(drawer_state);
}
http://repo.or.cz/w/wmaker-crm.git/commit/6ad22c867281a427fd5aedc3dc1a1ae5c6021b03
commit 6ad22c867281a427fd5aedc3dc1a1ae5c6021b03
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 15:35:49 2013 +0200
Removed unused WScreen argument in Pixmap function
diff --git a/src/pixmap.c b/src/pixmap.c
index d6b9431..9bb0622 100644
--- a/src/pixmap.c
+++ b/src/pixmap.c
@@ -98,7 +98,7 @@ WPixmap *wPixmapCreateFromXBMData(WScreen * scr, char *data,
char *mask,
return pix;
}
-WPixmap *wPixmapCreate(WScreen * scr, Pixmap image, Pixmap mask)
+WPixmap *wPixmapCreate(Pixmap image, Pixmap mask)
{
WPixmap *pix;
Window foo;
diff --git a/src/pixmap.h b/src/pixmap.h
index 38afac2..094bd52 100644
--- a/src/pixmap.h
+++ b/src/pixmap.h
@@ -34,7 +34,7 @@ typedef struct WPixmap {
} WPixmap;
-WPixmap *wPixmapCreate(WScreen *scr, Pixmap image, Pixmap mask);
+WPixmap *wPixmapCreate(Pixmap image, Pixmap mask);
WPixmap *wPixmapCreateFromXPMData(WScreen *scr, char **data);
diff --git a/src/screen.c b/src/screen.c
index b723125..715894e 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -242,7 +242,7 @@ static WPixmap *make3Dots(WScreen * scr)
XFreeGC(dpy, gc2);
- wpix = wPixmapCreate(scr, pix, mask);
+ wpix = wPixmapCreate(pix, mask);
wpix->shared = 1;
return wpix;
diff --git a/src/window.c b/src/window.c
index 552b6f6..3146bb5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2109,7 +2109,7 @@ void wWindowUpdateButtonImages(WWindow *wwin)
}
if (!fwin->lbutton_image) {
- fwin->lbutton_image = wPixmapCreate(scr,
pixmap, mask);
+ fwin->lbutton_image = wPixmapCreate(pixmap,
mask);
fwin->lbutton_image->client_owned = 1;
fwin->lbutton_image->client_owned_mask = 1;
}
@@ -2150,7 +2150,7 @@ void wWindowUpdateButtonImages(WWindow *wwin)
}
if (!fwin->rbutton_image) {
- fwin->rbutton_image = wPixmapCreate(scr,
pixmap, mask);
+ fwin->rbutton_image = wPixmapCreate(pixmap,
mask);
fwin->rbutton_image->client_owned = 1;
fwin->rbutton_image->client_owned_mask = 1;
}
http://repo.or.cz/w/wmaker-crm.git/commit/803eb68fc40752a4ef40295ebaff1256c0b6d62b
commit 803eb68fc40752a4ef40295ebaff1256c0b6d62b
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 15:35:48 2013 +0200
Removed unused WScreen argument from workspace's state functions
Now that the workspace are not more attached to a screen, the
parameter is not needed anymore.
diff --git a/src/screen.c b/src/screen.c
index 72a7dc5..b723125 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -873,7 +873,7 @@ void wScreenSaveState(WScreen * scr)
}
}
- wWorkspaceSaveState(scr, old_state);
+ wWorkspaceSaveState(old_state);
if (!wPreferences.flags.nodrawer) {
wDrawersSaveState(scr);
diff --git a/src/workspace.c b/src/workspace.c
index 5cf3863..10c348d 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -798,7 +798,7 @@ void wWorkspaceMenuUpdate(WMenu *menu)
wMenuPaint(menu);
}
-void wWorkspaceSaveState(WScreen * scr, WMPropList * old_state)
+void wWorkspaceSaveState(WMPropList * old_state)
{
WMPropList *parr, *pstr, *wks_state, *old_wks_state, *foo, *bar;
int i;
diff --git a/src/workspace.h b/src/workspace.h
index 2398989..28191a2 100644
--- a/src/workspace.h
+++ b/src/workspace.h
@@ -38,7 +38,7 @@ void wWorkspaceForceChange(WScreen *scr, int workspace);
WMenu *wWorkspaceMenuMake(WScreen *scr, Bool titled);
void wWorkspaceMenuUpdate(WMenu *menu);
void wWorkspaceMenuEdit(WScreen *scr);
-void wWorkspaceSaveState(WScreen *scr, WMPropList *old_state);
+void wWorkspaceSaveState(WMPropList *old_state);
void wWorkspaceRestoreState(WScreen *scr);
void wWorkspaceRename(WScreen *scr, int workspace, const char *name);
void wWorkspaceRelativeChange(WScreen *scr, int amount);
http://repo.or.cz/w/wmaker-crm.git/commit/fd869154c655d16160712324d2b565829f7e2377
commit fd869154c655d16160712324d2b565829f7e2377
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 15:35:47 2013 +0200
Removed unused WScreen argument from dock's clip state functions
Now that the workspace are not more attached to a screen, the
parameter is not needed anymore.
diff --git a/src/dock.c b/src/dock.c
index a6b4d99..2385700 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -1556,7 +1556,7 @@ void wDockSaveState(WScreen *scr, WMPropList *old_state)
WMReleasePropList(dock_state);
}
-void wClipSaveState(WScreen *scr)
+void wClipSaveState(void)
{
WMPropList *clip_state;
@@ -1566,7 +1566,7 @@ void wClipSaveState(WScreen *scr)
WMReleasePropList(clip_state);
}
-WMPropList *wClipSaveWorkspaceState(WScreen *scr, int workspace)
+WMPropList *wClipSaveWorkspaceState(int workspace)
{
return dockSaveState(w_global.workspace.array[workspace]->clip);
}
diff --git a/src/dock.h b/src/dock.h
index 9ac4d20..e7dd2c2 100644
--- a/src/dock.h
+++ b/src/dock.h
@@ -97,8 +97,8 @@ int wDockReceiveDNDDrop(WScreen *scr, XEvent *event);
#endif
void wClipIconPaint(void);
-void wClipSaveState(WScreen *scr);
-WMPropList *wClipSaveWorkspaceState(WScreen *scr, int workspace);
+void wClipSaveState(void);
+WMPropList *wClipSaveWorkspaceState(int workspace);
WAppIcon *wClipRestoreState(WScreen *scr, WMPropList *clip_state);
void wDrawerIconPaint(WAppIcon *dicon);
diff --git a/src/screen.c b/src/screen.c
index c1fa714..72a7dc5 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -866,7 +866,7 @@ void wScreenSaveState(WScreen * scr)
}
}
if (!wPreferences.flags.noclip) {
- wClipSaveState(scr);
+ wClipSaveState();
} else {
if ((foo = WMGetFromPLDictionary(old_state, dClip)) != NULL) {
WMPutInPLDictionary(w_global.session_state, dClip, foo);
diff --git a/src/workspace.c b/src/workspace.c
index 405aaa1..5cf3863 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -812,7 +812,7 @@ void wWorkspaceSaveState(WScreen * scr, WMPropList *
old_state)
wks_state = WMCreatePLDictionary(dName, pstr, NULL);
WMReleasePropList(pstr);
if (!wPreferences.flags.noclip) {
- pstr = wClipSaveWorkspaceState(scr, i);
+ pstr = wClipSaveWorkspaceState(i);
WMPutInPLDictionary(wks_state, dClip, pstr);
WMReleasePropList(pstr);
} else if (old_wks_state != NULL) {
http://repo.or.cz/w/wmaker-crm.git/commit/9c6e71ead02ca688f02d6a0d84c4591611e445ca
commit 9c6e71ead02ca688f02d6a0d84c4591611e445ca
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sat Oct 12 12:40:21 2013 +0200
Removed unused WScreen argument
The argument WScreen was not longer used, so can be removed.
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);
-----------------------------------------------------------------------
Summary of changes:
src/appicon.c | 2 +-
src/defaults.c | 2 +-
src/defaults.h | 6 +++---
src/dock.c | 12 ++++++------
src/dock.h | 6 +++---
src/dockedapp.c | 2 +-
src/pixmap.c | 2 +-
src/pixmap.h | 2 +-
src/screen.c | 6 +++---
src/session.c | 2 +-
src/wdefaults.c | 8 ++++----
src/window.c | 9 ++++-----
src/winspector.c | 4 ++--
src/workspace.c | 6 +++---
src/workspace.h | 4 ++--
15 files changed, 36 insertions(+), 37 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
