gnome-settings-daemon r728 - in trunk: . plugins/keybindings

[jensg svn gnome org]

Author: jensg
Date: Fri Feb 20 20:05:48 2009
New Revision: 728
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=728&view=rev

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

	* plugins/keybindings/gsd-keybindings-manager.c: (parse_binding),
	(bindings_get_entry): don't output a warning for disabled shortcuts


Modified:
   trunk/ChangeLog
   trunk/plugins/keybindings/gsd-keybindings-manager.c

Modified: trunk/plugins/keybindings/gsd-keybindings-manager.c
==============================================================================
--- trunk/plugins/keybindings/gsd-keybindings-manager.c	(original)
+++ trunk/plugins/keybindings/gsd-keybindings-manager.c	Fri Feb 20 20:05:48 2009
@@ -115,6 +115,8 @@
 static gboolean
 parse_binding (Binding *binding)
 {
+        gboolean success;
+
         g_return_val_if_fail (binding != NULL, FALSE);
 
         binding->key.keysym = 0;
@@ -128,10 +130,15 @@
                 return FALSE;
         }
 
-        return egg_accelerator_parse_virtual (binding->binding_str,
-                                              &binding->key.keysym,
-                                              &binding->key.keycodes,
-                                              &binding->key.state);
+        success = egg_accelerator_parse_virtual (binding->binding_str,
+                                                 &binding->key.keysym,
+                                                 &binding->key.keycodes,
+                                                 &binding->key.state);
+
+        if (!success)
+            g_warning (_("Key binding (%s) is invalid"), binding->gconf_key);
+
+        return success;
 }
 
 static gint
@@ -220,7 +227,6 @@
                 if (!tmp_elem)
                         manager->priv->binding_list = g_slist_prepend (manager->priv->binding_list, new_binding);
         } else {
-                g_warning (_("Key binding (%s) is invalid"), gconf_key);
                 g_free (new_binding->binding_str);
                 g_free (new_binding->action);
                 g_free (new_binding->gconf_key);