[gnome-control-center] region: GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS can be empty



commit 06e04097fde9d5d973c1fd945409ae3313b221fe
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jan 21 17:06:44 2011 +0000

    region: GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS can be empty
    
    But non-NULL. Handle that case.

 panels/region/gnome-region-panel-xkblt.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/panels/region/gnome-region-panel-xkblt.c b/panels/region/gnome-region-panel-xkblt.c
index 3249c69..ff21132 100644
--- a/panels/region/gnome-region-panel-xkblt.c
+++ b/panels/region/gnome-region-panel-xkblt.c
@@ -77,7 +77,8 @@ xkb_layouts_get_selected_list (void)
 
 	retval = g_settings_get_strv (xkb_keyboard_settings,
 				      GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS);
-	if (retval == NULL) {
+	if (retval == NULL || retval[0] == NULL) {
+		g_strfreev (retval);
 		retval = g_strdupv (initial_config.layouts_variants);
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]