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

[jensg svn gnome org]

Author: jensg
Date: Sat Apr 19 14:58:22 2008
New Revision: 309
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=309&view=rev

Log:
2008-04-19  Jens Granseuer  <jensgr gmx net>

	* plugins/keybindings/gsd-keybindings-manager.c:
	(bindings_get_entry): remove some code (and translatable strings) for
	error that can never happen


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	Sat Apr 19 14:58:22 2008
@@ -175,19 +175,9 @@
                 if (key_name == NULL) {
                         /* ignore entry */
                 } else if (strcmp (key_name, "action") == 0) {
-                        if (!action) {
-                                action = entry_get_string (entry);
-                        } else {
-                                g_warning (_("Key binding (%s) has its action defined multiple times"),
-                                           gconf_key);
-                        }
+                        action = entry_get_string (entry);
                 } else if (strcmp (key_name, "binding") == 0) {
-                        if (!key) {
-                                key = entry_get_string (entry);
-                        } else {
-                                g_warning (_("Key binding (%s) has its binding defined multiple times"),
-                                           gconf_key);
-                        }
+                        key = entry_get_string (entry);
                 }
 
                 g_free (key_name);