[Xfce4-commits] r29423 - in xfwm4/trunk: . settings-dialogs

[Jannis Pohlmann]

Author: jannis
Date: 2009-02-01 13:35:26 +0000 (Sun, 01 Feb 2009)
New Revision: 29423

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
Log:
	* settings-dialogs/xfwm4-settings.c: Only display shortcut conflict
	  dialog if the action of the new shortcut differs from the one
	  that's being edited.

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-02-01 12:59:50 UTC (rev 29422)
+++ xfwm4/trunk/ChangeLog	2009-02-01 13:35:26 UTC (rev 29423)
@@ -1,3 +1,9 @@
+2009-02-01	jannis
+
+	* settings-dialogs/xfwm4-settings.c: Only display shortcut conflict
+	  dialog if the action of the new shortcut differs from the one
+	  that's being edited.
+
 2009-01-29	olivier
 
 	* src/placement.c: Apparently someone is confusing East and West :)

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===================================================================
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c	2009-02-01 12:59:50 UTC (rev 29422)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c	2009-02-01 13:35:26 UTC (rev 29423)
@@ -1915,14 +1915,17 @@
 
   if (G_UNLIKELY (other_shortcut != NULL))
     {
-      response = xfce_shortcut_conflict_dialog (xfce_shortcuts_provider_get_name (settings->priv->provider),
-                                                xfce_shortcuts_provider_get_name (other_provider),
-                                                shortcut,
-                                                xfce_shortcut_dialog_get_action_name (dialog),
-                                                xfwm_settings_shortcut_feature_name (other_shortcut->command),
-                                                FALSE);
+      if (G_LIKELY (!g_str_equal (xfce_shortcut_dialog_get_action (dialog), other_shortcut->command)))
+        {
+          response = xfce_shortcut_conflict_dialog (xfce_shortcuts_provider_get_name (settings->priv->provider),
+                                                    xfce_shortcuts_provider_get_name (other_provider),
+                                                    shortcut,
+                                                    xfce_shortcut_dialog_get_action_name (dialog),
+                                                    xfwm_settings_shortcut_feature_name (other_shortcut->command),
+                                                    FALSE);
 
-      accepted = response == GTK_RESPONSE_ACCEPT;
+          accepted = response == GTK_RESPONSE_ACCEPT;
+        }
 
       xfce_shortcut_free (other_shortcut);
       g_object_unref (other_provider);