[Xfce4-commits] r29432 - in xfce4-settings/trunk: . dialogs/keyboard-settings

[Jannis Pohlmann]

Author: jannis
Date: 2009-02-02 23:09:02 +0000 (Mon, 02 Feb 2009)
New Revision: 29432

Modified:
   xfce4-settings/trunk/NEWS
   xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
Log:
When stealing a shortcut from another shortcuts provider, clear the
shortcut of that provider first. Update NEWS file.

Modified: xfce4-settings/trunk/NEWS
===================================================================
--- xfce4-settings/trunk/NEWS	2009-02-02 22:43:03 UTC (rev 29431)
+++ xfce4-settings/trunk/NEWS	2009-02-02 23:09:02 UTC (rev 29432)
@@ -1,7 +1,11 @@
-4.x.xx
-======
+4.5.99.2 (Xfce 4.6rc2)
+======================
 - Make the Xrandr dependency optional. If Xrandr is disabled, the
   display plugin won't be compiled at all (bug #4836).
+- When stealing a shortcut from another shortcuts provider, clear the 
+  shortcut of that provider first.
+- Make embedded settings dialogs optional (and disabled by default). 
+  They can be turned on using --enable-pluggable-dialogs.
 
 4.5.99.1 (Xfce 4.6rc1)
 ======================

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-02-02 22:43:03 UTC (rev 29431)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-02-02 23:09:02 UTC (rev 29432)
@@ -764,7 +764,10 @@
                                                 info->shortcut->command,
                                                 FALSE);
 
-      accepted = response == GTK_RESPONSE_ACCEPT;
+      if (G_UNLIKELY (response == GTK_RESPONSE_ACCEPT))
+        xfce_shortcuts_provider_reset_shortcut (info->provider, shortcut);
+      else
+        accepted = FALSE;
 
       xfce_keyboard_settings_free_shortcut_info (info);
     }