[Xfce4-commits] [xfce/xfce4-settings] 01/01: Fix issues found with cppcheck (Thanks Mario) (Bug 10879)

[noreply at xfce.org]

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

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

commit 835671ad8db9bcaed4ec3d53753b7f9a8b4610a7
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Jan 31 11:31:52 2015 -0500

    Fix issues found with cppcheck (Thanks Mario) (Bug 10879)
---
 dialogs/display-settings/main.c |    3 +++
 xfsettingsd/keyboard-layout.c   |    4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 2080b9c..d7cc8d3 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -2861,6 +2861,9 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
             /* Can outputs be cloned? */
             if (display_settings_get_n_active_outputs () > 1)
                 mode = xfce_randr_clonable_mode (xfce_randr);
+            else
+                mode = None;
+
             gtk_widget_set_sensitive (GTK_WIDGET (mirror_displays), mode != None);
 
             if (xfce_randr->mode[0] != None)
diff --git a/xfsettingsd/keyboard-layout.c b/xfsettingsd/keyboard-layout.c
index f4ee672..0c007e6 100644
--- a/xfsettingsd/keyboard-layout.c
+++ b/xfsettingsd/keyboard-layout.c
@@ -298,7 +298,9 @@ xfce_keyboard_layout_get_option (gchar **options,
         }
     }
 
-    *_other_options = other_options;
+    if (_other_options)
+        *_other_options = other_options;
+
     return option_value;
 }
 

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