[gnome-control-center] keyboard: Check for NULL value first



commit 3d3cfa7304a71205aa08aec6e9d1592787e5accb
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Oct 20 15:53:25 2011 +0100

    keyboard: Check for NULL value first
    
    Then try to access item->type

 panels/keyboard/keyboard-shortcuts.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/panels/keyboard/keyboard-shortcuts.c b/panels/keyboard/keyboard-shortcuts.c
index dcbd08d..2ed4f5e 100644
--- a/panels/keyboard/keyboard-shortcuts.c
+++ b/panels/keyboard/keyboard-shortcuts.c
@@ -1144,12 +1144,12 @@ description_edited_callback (GtkCellRendererText *renderer,
                       DETAIL_KEYENTRY_COLUMN, &item,
                       -1);
 
-  g_assert (item->type == CC_KEYBOARD_ITEM_TYPE_GCONF_DIR);
-
   /* sanity check */
   if (item == NULL || item->desc_gconf_key == NULL)
     return;
 
+  g_assert (item->type == CC_KEYBOARD_ITEM_TYPE_GCONF_DIR);
+
   client = gconf_client_get_default ();
   if (!gconf_client_set_string (client, item->desc_gconf_key, new_text, NULL))
     item->desc_editable = FALSE;



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