gnome-control-center r9285 - trunk/capplets/keybindings

[jensg svn gnome org]

Author: jensg
Date: Mon Feb 23 18:38:27 2009
New Revision: 9285
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9285&view=rev

Log:
2009-02-23  Jens Granseuer  <jensgr gmx net>

	* gnome-keybinding-properties.c: (append_keys_to_tree),
	(update_custom_shortcut): for shortcuts without a description simply
	show "<Unknown Action>" instead of (unhelpful) parts of its GConf
	path (bug #572808)


Modified:
   trunk/capplets/keybindings/ChangeLog
   trunk/capplets/keybindings/gnome-keybinding-properties.c

Modified: trunk/capplets/keybindings/gnome-keybinding-properties.c
==============================================================================
--- trunk/capplets/keybindings/gnome-keybinding-properties.c	(original)
+++ trunk/capplets/keybindings/gnome-keybinding-properties.c	Mon Feb 23 18:38:27 2009
@@ -611,7 +611,6 @@
 	  /* Only print a warning for keys that should have a schema */
 	  if (keys_list[j].description_name == NULL)
 	    g_warning ("No description for key '%s'", key_string);
-	  description = g_path_get_basename (key_string);
 	}
 
       if (keys_list[j].cmd_name != NULL)
@@ -1468,7 +1467,10 @@
       gtk_tree_store_set (GTK_TREE_STORE (model), iter,
 			  KEYENTRY_COLUMN, key, -1);
       client = gconf_client_get_default ();
-      gconf_client_set_string (client, key->desc_gconf_key, key->description, NULL);
+      if (key->description != NULL)
+        gconf_client_set_string (client, key->desc_gconf_key, key->description, NULL);
+      else
+        gconf_client_unset (client, key->desc_gconf_key, NULL);
       gconf_client_set_string (client, key->cmd_gconf_key, key->command, NULL);
       g_object_unref (client);
     }