Author: olivier
Date: 2008-05-20 21:51:26 +0000 (Tue, 20 May 2008)
New Revision: 26980
Modified:
xfwm4/trunk/src/netwm.c
xfwm4/trunk/src/screen.c
xfwm4/trunk/src/workspaces.c
Log:
Fix gcc warnings (bug #4095, Gauvain Pocentek <[EMAIL PROTECTED]>
Modified: xfwm4/trunk/src/netwm.c
===================================================================
--- xfwm4/trunk/src/netwm.c 2008-05-19 18:24:28 UTC (rev 26979)
+++ xfwm4/trunk/src/netwm.c 2008-05-20 21:51:26 UTC (rev 26980)
@@ -957,7 +957,6 @@
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);
Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c 2008-05-19 18:24:28 UTC (rev 26979)
+++ xfwm4/trunk/src/screen.c 2008-05-20 21:51:26 UTC (rev 26980)
@@ -129,11 +129,12 @@
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;
Modified: xfwm4/trunk/src/workspaces.c
===================================================================
--- xfwm4/trunk/src/workspaces.c 2008-05-19 18:24:28 UTC (rev 26979)
+++ xfwm4/trunk/src/workspaces.c 2008-05-20 21:51:26 UTC (rev 26980)
@@ -180,7 +180,7 @@
{
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 @@
void
workspaceInsert (ScreenInfo * screen_info, int index)
{
- DisplayInfo *display_info;
Client *c;
int i, count;
@@ -498,7 +497,6 @@
void
workspaceDelete (ScreenInfo * screen_info, int index)
{
- DisplayInfo *display_info;
Client *c;
int i, count;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
