Index: src/workspaces.c
===================================================================
--- src/workspaces.c	(revision 26979)
+++ src/workspaces.c	(working copy)
@@ -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;
 
Index: src/screen.c
===================================================================
--- src/screen.c	(revision 26979)
+++ src/screen.c	(working copy)
@@ -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;
 
Index: src/netwm.c
===================================================================
--- src/netwm.c	(revision 26979)
+++ src/netwm.c	(working copy)
@@ -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);