Fix compiler warnings

(Old svn revision: 28022)

7 files changed, 10 insertions, 13 deletions

diff --git a/helper-dialog/helper-dialog.c b/helper-dialog/helper-dialog.c
index 2e8c64226..84d40b6c3 100644
--- a/helper-dialog/helper-dialog.c
+++ b/helper-dialog/helper-dialog.c
@@ -82,8 +82,7 @@ main (int argc, char **argv)
                                      GTK_MESSAGE_WARNING,
                                      GTK_BUTTONS_YES_NO,
                                      _("This window might be busy and is not responding.\n"
-                                       "Do you want to terminate the application?"),
-                                     NULL);
+                                       "Do you want to terminate the application?"));
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO);
     gtk_widget_set (GTK_WIDGET (dialog), "secondary-text", title, NULL);
diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am
index fb7f584a1..08ad6e683 100644
--- a/settings-dialogs/Makefile.am
+++ b/settings-dialogs/Makefile.am
@@ -91,18 +91,19 @@ INCLUDES = \
 if MAINTAINER_MODE
 
 BUILT_SOURCES = \
+monitor-icon.h \
 xfwm4-dialog_glade.h \
 xfwm4-tweaks-dialog_glade.h \
 xfwm4-workspace-dialog_glade.h
 
 xfwm4-workspace-dialog_glade.h: xfwm4-workspace-dialog.glade
-	exo-csource --static --name=workspace_dialog_glade $< >$@
+	exo-csource --static --strip-comments --strip-content --name=workspace_dialog_glade $< >$@
 
 xfwm4-dialog_glade.h: xfwm4-dialog.glade
-	exo-csource --static --name=xfwm4_dialog_glade $< >$@
+	exo-csource --static --strip-comments --strip-content --name=xfwm4_dialog_glade $< >$@
 
 xfwm4-tweaks-dialog_glade.h: xfwm4-tweaks-dialog.glade
-	exo-csource --static --name=tweaks_dialog_glade $< >$@
+	exo-csource --static --strip-comments --strip-content --name=tweaks_dialog_glade $< >$@
 
 monitor-icon.h: $(srcdir)/monitor-icon.png
 	gdk-pixbuf-csource --raw --build-list \
diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c
index 2cfcfe876..c43a689e3 100644
--- a/settings-dialogs/tweaks-settings.c
+++ b/settings-dialogs/tweaks-settings.c
@@ -149,7 +149,6 @@ wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
 
     /* Focus tab */
     GtkWidget *prevent_focus_stealing_check = glade_xml_get_widget (gxml, "prevent_focus_stealing_check");
-    GtkWidget *prevent_focus_stealing_box = glade_xml_get_widget (gxml, "prevent_focus_stealing_box");
     GtkWidget *focus_hint_check = glade_xml_get_widget (gxml, "focus_hint_check");
 
     GtkWidget *activate_action_bring_option = glade_xml_get_widget (gxml, "activate_action_bring_option");
diff --git a/settings-dialogs/workspace-settings.c b/settings-dialogs/workspace-settings.c
index 7531f4fa4..1056de299 100644
--- a/settings-dialogs/workspace-settings.c
+++ b/settings-dialogs/workspace-settings.c
@@ -106,7 +106,7 @@ workspace_names_update_xfconf(gint workspace,
     }
 
     if(do_update_xfconf)
-        xfconf_channel_set_string_list(channel, WORKSPACE_NAMES_PROP, names);
+        xfconf_channel_set_string_list(channel, WORKSPACE_NAMES_PROP, (const gchar **)names);
 
     g_strfreev(names);
     g_object_unref(G_OBJECT(channel));
diff --git a/src/client.c b/src/client.c
index 01df0d9af..4baa1220b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -170,7 +170,7 @@ clientCreateTitleName (Client * c, gchar *name, gchar *hostname)
     DisplayInfo *display_info;
     gchar *title;
 
-    g_return_if_fail (c != NULL);
+    g_return_val_if_fail (c != NULL, NULL);
     TRACE ("entering clientCreateTitleName");
 
     screen_info = c->screen_info;
@@ -2553,7 +2553,7 @@ clientTerminate (Client * c)
     {
         if (!strcmp (display_info->hostname, c->hostname))
         {
-            TRACE ("Sending client %s (pid %i) signal SIGKILL\n", c->name);
+            TRACE ("Sending client %s (pid %i) signal SIGKILL\n", c->name, c->pid);
 
             if (kill (c->pid, SIGKILL) < 0)
             {
diff --git a/src/cycle.c b/src/cycle.c
index 6fe49504b..22ac66c1f 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -236,7 +236,7 @@ clientCycle (Client * c, XKeyEvent * ev)
         passdata.cycle_range |= INCLUDE_ALL_WORKSPACES;
     }
     passdata.c = clientGetNext (c, passdata.cycle_range);
-    passdata.wireframe = NULL;
+    passdata.wireframe = None;
 
     /* If there is one single client, and if it's eligible for focus, use it */
     if ((passdata.c == NULL) && (c != clientGetFocus()) &&
diff --git a/src/terminate.c b/src/terminate.c
index e82fdc628..9cf3ea87e 100644
--- a/src/terminate.c
+++ b/src/terminate.c
@@ -54,8 +54,6 @@ terminateProcessIO (GIOChannel   *channel,
                     gpointer      data)
 {
     Client *c;
-    int pid;
-    Window xwindow;
     char *str;
     gsize len;
     GError *err;
@@ -105,7 +103,7 @@ terminateShowDialog (Client *c)
 
     if (c->dialog_pid > 0)
     {
-        return;
+        return FALSE;
     }
 
     screen_info = c->screen_info;