[Xfce4-commits] Don't crash if keyboard model is not set

[Igor Slepchin]

Updating branch refs/heads/4.10_panel_support
         to cdc7ac5c1759e5b065ec6ddf95f57d10d0fc87cc (commit)
       from 5f5cd2151d9961c5bc89db983228e4e8074b331f (commit)

commit cdc7ac5c1759e5b065ec6ddf95f57d10d0fc87cc
Author: Igor Slepchin <igor.slepc...@gmail.com>
Date:   Mon Mar 25 16:41:33 2013 -0400

    Don't crash if keyboard model is not set

 panel-plugin/xkb-settings-dialog.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index 0dab764..0d19c43 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -304,7 +304,7 @@ xkb_settings_set_kbd_combo_default_value (t_xkb *xkb)
         return;
 
     gtk_tree_model_get (model, &iter, NOM, &id, -1);
-    if (strcmp (id, config->model) == 0 )
+    if (config->model && strcmp (id, config->model) == 0 )
         gtk_combo_box_set_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), 
&iter);
     else
     {
@@ -313,7 +313,7 @@ xkb_settings_set_kbd_combo_default_value (t_xkb *xkb)
             g_free (id);
             gtk_tree_model_get (model, &iter, NOM, &id, -1);
 
-            if (strcmp (id, config->model) == 0)
+            if (config->model && strcmp (id, config->model) == 0)
             {
                 gtk_combo_box_set_active_iter (GTK_COMBO_BOX 
(xkb->kbd_model_combo), &iter);
                 break;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits