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 b565b48b92f7ad770158b88213dc18ba71659ac5 (commit)
via e56438d2c12ff561672b1146374f185643eae375 (commit)
from 8b1babc5b36bafdc4f46da8176a438587e14af08 (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/b565b48b92f7ad770158b88213dc18ba71659ac5
commit b565b48b92f7ad770158b88213dc18ba71659ac5
Author: Christophe CURIS <[email protected]>
Date: Sat Nov 2 17:36:33 2013 +0100
wmaker: Removed unused argument in function 'wDockLaunchWithState'
The function did not use the argument 'dock', so remove it.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/src/dock.c b/src/dock.c
index 0c88a32..222627f 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -2000,7 +2000,7 @@ finish:
return dock;
}
-void wDockLaunchWithState(WDock *dock, WAppIcon *btn, WSavedState *state)
+void wDockLaunchWithState(WAppIcon *btn, WSavedState *state)
{
if (btn && btn->command && !btn->running && !btn->launching) {
btn->drop_launch = 0;
@@ -2034,7 +2034,7 @@ void wDockDoAutoLaunch(WDock *dock, int workspace)
state->workspace = workspace;
/* TODO: this is klugy and is very difficult to understand
* what's going on. Try to clean up */
- wDockLaunchWithState(dock, btn, state);
+ wDockLaunchWithState(btn, state);
}
}
diff --git a/src/dock.h b/src/dock.h
index 6df8da7..ff6a533 100644
--- a/src/dock.h
+++ b/src/dock.h
@@ -90,7 +90,7 @@ void wDockFinishLaunch(WAppIcon *icon);
void wDockTrackWindowLaunch(WDock *dock, Window window);
WAppIcon *wDockFindIconForWindow(WDock *dock, Window window);
void wDockDoAutoLaunch(WDock *dock, int workspace);
-void wDockLaunchWithState(WDock *dock, WAppIcon *btn, WSavedState *state);
+void wDockLaunchWithState(WAppIcon *btn, WSavedState *state);
#ifdef XDND
int wDockReceiveDNDDrop(WScreen *scr, XEvent *event);
diff --git a/src/session.c b/src/session.c
index f7f5f3f..12a0744 100644
--- a/src/session.c
+++ b/src/session.c
@@ -513,7 +513,7 @@ void wSessionRestoreState(WScreen *scr)
}
if (found) {
- wDockLaunchWithState(dock, btn, state);
+ wDockLaunchWithState(btn, state);
} else if ((pid = execCommand(scr, command)) > 0) {
wWindowAddSavedState(instance, class, command, pid,
state);
} else {
http://repo.or.cz/w/wmaker-crm.git/commit/e56438d2c12ff561672b1146374f185643eae375
commit e56438d2c12ff561672b1146374f185643eae375
Author: Christophe CURIS <[email protected]>
Date: Sat Nov 2 17:36:32 2013 +0100
wmaker: Removed unused argument in function 'wDockFinishLaunch'
The function did not use the argument 'dock', so remove it.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/src/application.c b/src/application.c
index fe8fe6e..ff6461d 100644
--- a/src/application.c
+++ b/src/application.c
@@ -98,7 +98,7 @@ WApplication *wApplicationCreate(WWindow * wwin)
wapp->refcount++;
if (wapp->app_icon && wapp->app_icon->docked &&
wapp->app_icon->relaunching &&
wapp->main_window_desc->fake_group)
- wDockFinishLaunch(wapp->app_icon->dock, wapp->app_icon);
+ wDockFinishLaunch(wapp->app_icon);
return wapp;
}
diff --git a/src/dock.c b/src/dock.c
index 9da119c..0c88a32 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -3180,7 +3180,7 @@ void wDockRaiseLower(WDock *dock)
wDockRaise(dock);
}
-void wDockFinishLaunch(WDock *dock, WAppIcon *icon)
+void wDockFinishLaunch(WAppIcon *icon)
{
icon->launching = 0;
icon->relaunching = 0;
@@ -3275,7 +3275,7 @@ void wDockTrackWindowLaunch(WDock *dock, Window window)
XUnmapWindow(dpy, aicon->icon->core->window);
wAppIconDestroy(aicon);
}
- wDockFinishLaunch(dock, icon);
+ wDockFinishLaunch(icon);
break;
}
}
@@ -3346,7 +3346,7 @@ static void trackDeadProcess(pid_t pid, unsigned char
status, WDock *dock)
icon->running = 0;
icon->main_window = None;
}
- wDockFinishLaunch(dock, icon);
+ wDockFinishLaunch(icon);
icon->pid = 0;
if (status == 111) {
char msg[PATH_MAX];
diff --git a/src/dock.h b/src/dock.h
index f3a59b2..6df8da7 100644
--- a/src/dock.h
+++ b/src/dock.h
@@ -86,7 +86,7 @@ void wDockReattachIcon(WDock *dock, WAppIcon *icon, int x,
int y);
void wSlideAppicons(WAppIcon **appicons, int n, int to_the_left);
void wDrawerFillTheGap(WDock *drawer, WAppIcon *aicon, Bool redocking);
-void wDockFinishLaunch(WDock *dock, WAppIcon *icon);
+void wDockFinishLaunch(WAppIcon *icon);
void wDockTrackWindowLaunch(WDock *dock, Window window);
WAppIcon *wDockFindIconForWindow(WDock *dock, Window window);
void wDockDoAutoLaunch(WDock *dock, int workspace);
-----------------------------------------------------------------------
Summary of changes:
src/application.c | 2 +-
src/dock.c | 10 +++++-----
src/dock.h | 4 ++--
src/session.c | 2 +-
4 files changed, 9 insertions(+), 9 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].
