[Xfce4-commits] [xfce/xfce4-settings] 02/02: Fix build with -Werror

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfce4-settings.

commit 404d982f2936a58649423642956be563982b2ffa
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Thu Feb 5 15:02:45 2015 +0100

    Fix build with -Werror
    
    As enabled by --enable-debug.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 dialogs/display-settings/edid-parse.c               |    2 +-
 dialogs/display-settings/main.c                     |    7 ++++---
 dialogs/keyboard-settings/xfce-keyboard-settings.c  |    6 ++----
 dialogs/mouse-settings/main.c                       |    6 ++++--
 xfce4-settings-editor/xfce-settings-editor-dialog.c |    2 +-
 xfsettingsd/displays.c                              |    2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dialogs/display-settings/edid-parse.c b/dialogs/display-settings/edid-parse.c
index 7c35733..6abc6ee 100644
--- a/dialogs/display-settings/edid-parse.c
+++ b/dialogs/display-settings/edid-parse.c
@@ -334,7 +334,7 @@ decode_standard_timings (const uchar *edid, MonitorInfo *info)
         if (first != 0x01 && second != 0x01)
         {
             int w = 8 * (first + 31);
-            int h;
+            int h = 0;
 
             switch (get_bits (second, 6, 7))
             {
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index d7cc8d3..867e000 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -136,7 +136,7 @@ static XfceRandr *xfce_randr = NULL;
 static gint randr_event_base;
 
 /* Used to identify the display */
-static GHashTable *display_popups;
+static GHashTable *display_popups = NULL;
 gboolean show_popups = FALSE;
 
 gboolean supports_alpha = FALSE;
@@ -172,7 +172,8 @@ display_settings_changed (void)
 static XfceOutputInfo*
 get_nth_xfce_output_info(gint id)
 {
-    XfceOutputInfo *output;
+    XfceOutputInfo *output = NULL;
+
     if (current_outputs)
         output = g_list_nth (current_outputs, id)->data;
 
@@ -772,7 +773,7 @@ static GtkWidget *
 display_setting_identity_display (gint display_id)
 {
     GtkBuilder       *builder;
-    GtkWidget        *popup;
+    GtkWidget        *popup = NULL;
     GObject          *display_name, *display_details;
     const XfceRRMode *current_mode;
     gchar            *color_hex = "#FFFFFF", *name_label, *details_label;
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index b6f8b0c..cca0e6e 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -1156,10 +1156,8 @@ xfce_keyboard_settings_edit_button_clicked (XfceKeyboardSettings *settings)
                   /* Get shortcut */
                   new_shortcut =
                     xfce_shortcut_dialog_get_shortcut (XFCE_SHORTCUT_DIALOG (shortcut_dialog));
-
-                  if (g_strcmp0 (command, new_command) != 0
-                      || (test_new_shortcut = (g_strcmp0 (shortcut, new_shortcut) != 0))
-                      || snotify != new_snotify)
+                  test_new_shortcut = (g_strcmp0 (shortcut, new_shortcut) != 0);
+                  if (g_strcmp0 (command, new_command) != 0 || (test_new_shortcut) || snotify != new_snotify)
                     {
                       /* Remove the row because we add new one from the
                        * shortcut-added signal */
diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index 85f5cf3..1942612 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -1125,9 +1125,11 @@ mouse_settings_device_selection_changed (GtkBuilder *builder)
     gint               ndevices;
     gboolean           is_synaptics = FALSE;
     gboolean           is_wacom = FALSE;
-    gboolean           is_libinput = FALSE;
     gboolean           left_handed = FALSE;
     gboolean           reverse_scrolling = FALSE;
+#ifdef HAVE_LIBINPUT
+    gboolean           is_libinput = FALSE;
+#endif /* HAVE_LIBINPUT */
 #ifdef DEVICE_PROPERTIES
     Atom               synaptics_prop;
     Atom               wacom_prop;
@@ -1302,7 +1304,7 @@ mouse_settings_device_selection_changed (GtkBuilder *builder)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (object), TRUE);
 
     object = gtk_builder_get_object (builder, "device-reverse-scrolling");
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (object), !!(id_5 < id_4));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (object), reverse_scrolling);
     gtk_widget_set_sensitive (GTK_WIDGET (object), nbuttons >= 5);
 
     /* update acceleration scale */
diff --git a/xfce4-settings-editor/xfce-settings-editor-dialog.c b/xfce4-settings-editor/xfce-settings-editor-dialog.c
index fb7a10f..4033206 100644
--- a/xfce4-settings-editor/xfce-settings-editor-dialog.c
+++ b/xfce4-settings-editor/xfce-settings-editor-dialog.c
@@ -791,7 +791,7 @@ xfce_settings_editor_dialog_channel_reset (XfceSettingsEditorDialog *dialog)
     GtkTreeIter        iter;
     GtkTreePath       *path;
     gchar            **channels;
-    gboolean           found;
+    gboolean           found = FALSE;
     guint              i;
 
     if (dialog->props_channel == NULL)
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 89bad40..6d5e8db 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -408,7 +408,7 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent,
 {
     XfceDisplaysHelper *helper = XFCE_DISPLAYS_HELPER (data);
     GPtrArray          *old_outputs;
-    XfceRRCrtc         *crtc;
+    XfceRRCrtc         *crtc = NULL;
     XfceRROutput       *output, *o;
     XEvent             *e = xevent;
     gint                event_num;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.