diff options
| author | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2008-05-20 21:51:26 +0000 |
|---|---|---|
| committer | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2008-05-20 21:51:26 +0000 |
| commit | 528fb87a2176ac8575d24621168d1102bb90aeb6 (patch) | |
| tree | 31386b402e0f626d7f476023ed49c04430e6d28f | |
| parent | 9a9d6e6c04b6667d4f3cbeba0bd3a58d67d494a8 (diff) | |
| download | xfwm4-528fb87a2176ac8575d24621168d1102bb90aeb6.tar.gz | |
Fix gcc warnings (bug #4095, Gauvain Pocentek <gauvainpocentek@gmail.com>
(Old svn revision: 26980)
| -rw-r--r-- | src/netwm.c | 1 | ||||
| -rw-r--r-- | src/screen.c | 3 | ||||
| -rw-r--r-- | src/workspaces.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/netwm.c b/src/netwm.c index 3da4ed28f..1cffb09be 100644 --- a/src/netwm.c +++ b/src/netwm.c @@ -957,7 +957,6 @@ clientValidateNetStrut (Client * c) ScreenInfo *screen_info; gboolean valid; int max_value; - int i; g_return_val_if_fail (c != NULL, TRUE); TRACE ("entering clientValidateNetStrut for \"%s\" (0x%lx)", c->name, c->window); diff --git a/src/screen.c b/src/screen.c index 4b4008e2e..5fea86b7d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -129,11 +129,12 @@ myScreenSetWMAtom (ScreenInfo *screen_info, gboolean replace_wm) ScreenInfo * myScreenInit (DisplayInfo *display_info, GdkScreen *gscr, unsigned long event_mask, gboolean replace_wm) { +#ifdef ENABLE_KDE_SYSTRAY_PROXY gchar selection[32]; +#endif ScreenInfo *screen_info; GdkWindow *event_win; PangoLayout *layout; - Atom wm_sn_atom; long desktop_visible; int i, j; diff --git a/src/workspaces.c b/src/workspaces.c index bce66fc86..a9d300ebd 100644 --- a/src/workspaces.c +++ b/src/workspaces.c @@ -180,7 +180,7 @@ workspaceMove (ScreenInfo *screen_info, int rowmod, int colmod, Client * c, Time { int row, col, newrow, newcol, previous_ws, n; - g_return_if_fail (screen_info != NULL); + g_return_val_if_fail (screen_info != NULL, FALSE); TRACE ("entering workspaceMove"); @@ -470,7 +470,6 @@ workspaceSetCount (ScreenInfo * screen_info, int count) void workspaceInsert (ScreenInfo * screen_info, int index) { - DisplayInfo *display_info; Client *c; int i, count; @@ -498,7 +497,6 @@ workspaceInsert (ScreenInfo * screen_info, int index) void workspaceDelete (ScreenInfo * screen_info, int index) { - DisplayInfo *display_info; Client *c; int i, count; |