Fix compiler warnings

Tidy up the code.

Signed-off-by: Olivier Fourdan <fourdan@xfce.org>

4 files changed, 12 insertions, 6 deletions

diff --git a/settings-dialogs/xfwm4-settings.c b/settings-dialogs/xfwm4-settings.c
index ecdd3e810..5d8fbca45 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -145,7 +145,11 @@ static gboolean   xfwm_settings_active_frame_draw                    (GtkWidget
                                                                       cairo_t              *cr,
                                                                       XfwmSettings         *settings);
 static gboolean   xfwm_settings_signal_blocker                       (GtkWidget            *widget);
+
+/* FIXME! */
+#if 0
 static GdkPixbuf *xfwm_settings_create_icon_from_widget              (GtkWidget            *widget);
+#endif
 
 static void       xfwm_settings_save_button_layout                   (XfwmSettings          *settings,
                                                                       GtkContainer          *container);
@@ -1205,11 +1209,11 @@ xfwm_settings_hidden_frame_drag_data (GtkWidget        *widget,
 static gboolean
 xfwm_settings_title_button_press_event (GtkWidget *widget)
 {
+ /* FIXME! This crashes in cairo... xfce bug 14606 */
+#if 0
   GdkPixbuf *pixbuf;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE);
- /* FIXME! This crashes in cairo... xfce bug 14606 */
-#if 0
   /* set pixbuf before drag begin cause it can be not displayed */
   pixbuf = xfwm_settings_create_icon_from_widget (widget);
   gtk_drag_source_set_icon_pixbuf (widget, pixbuf);
@@ -1343,7 +1347,8 @@ xfwm_settings_signal_blocker (GtkWidget *widget)
 }
 
 
-
+/* FIXME! This crashes in cairo... xfce bug 14606 */
+#if 0
 static GdkPixbuf *
 xfwm_settings_create_icon_from_widget (GtkWidget *widget)
 {
@@ -1358,7 +1363,7 @@ xfwm_settings_create_icon_from_widget (GtkWidget *widget)
                                      allocation.x, allocation.y,
                                      allocation.width, allocation.height);
 }
-
+#endif
 
 
 static void
diff --git a/src/icons.c b/src/icons.c
index 861232200..ef47c08bb 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -396,7 +396,8 @@ try_pixmap_and_mask (ScreenInfo *screen_info, Pixmap src_pixmap, Pixmap src_mask
      * for bitmaps. And in that case, it's a differentiation between
      * foreground (white) and background (black).
      */
-    if (mask_surface && cairo_surface_get_content (surface) & CAIRO_CONTENT_ALPHA)
+    if (mask_surface &&
+        (cairo_surface_get_content (surface) & CAIRO_CONTENT_ALPHA))
     {
         cairo_push_group (cr);
 
diff --git a/src/stacking.c b/src/stacking.c
index 185127ad6..9c273ca69 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -412,6 +412,7 @@ clientRaise (Client * c, Window wsibling)
     }
 
     /* Search for the window that will be just on top of the raised window  */
+    client_sibling = NULL;
     if (wsibling)
     {
         c2 = myDisplayGetClientFromWindow (display_info, wsibling, SEARCH_FRAME | SEARCH_WINDOW);
diff --git a/src/transients.c b/src/transients.c
index 48cd7c297..82946a1de 100644
--- a/src/transients.c
+++ b/src/transients.c
@@ -321,7 +321,6 @@ clientGetTransientFor (Client * c)
 {
     ScreenInfo *screen_info;
     Client *first_parent;
-    Client *c2;
     GList *l1, *l2;
     GList *parents;