Author: jannis Date: 2009-02-01 22:42:42 +0000 (Sun, 01 Feb 2009) New Revision: 29427
Modified: xfwm4/trunk/ChangeLog xfwm4/trunk/NEWS xfwm4/trunk/settings-dialogs/xfwm4-settings.c Log: * NEWS: Update NEWS file. * settings-dialogs/xfwm4-settings.c: When stealing a shortcut from another shortcuts provider, clear the shortcut of that provider first. Modified: xfwm4/trunk/ChangeLog =================================================================== --- xfwm4/trunk/ChangeLog 2009-02-01 21:47:21 UTC (rev 29426) +++ xfwm4/trunk/ChangeLog 2009-02-01 22:42:42 UTC (rev 29427) @@ -1,5 +1,12 @@ 2009-02-01 jannis + * NEWS: Update NEWS file. + * settings-dialogs/xfwm4-settings.c: When stealing a shortcut from + another shortcuts provider, clear the shortcut of that provider + first. + +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. Modified: xfwm4/trunk/NEWS =================================================================== --- xfwm4/trunk/NEWS 2009-02-01 21:47:21 UTC (rev 29426) +++ xfwm4/trunk/NEWS 2009-02-01 22:42:42 UTC (rev 29427) @@ -3,6 +3,10 @@ - Fix possible monitor cache size inconsistency when the screen size changes. - Fix fill function not working with multiscreen. +- Only display the shortcut conflict dialog if the conflict is with a different + shortcut than the one being edited. +- When stealing a shortcut from another shortcuts provider, clear the shortcut + of that provider first. 4.5.99.1 (Xfce 4.6rc1) ====================== Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c =================================================================== --- xfwm4/trunk/settings-dialogs/xfwm4-settings.c 2009-02-01 21:47:21 UTC (rev 29426) +++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c 2009-02-01 22:42:42 UTC (rev 29427) @@ -1924,7 +1924,10 @@ xfwm_settings_shortcut_feature_name (other_shortcut->command), FALSE); - accepted = response == GTK_RESPONSE_ACCEPT; + if (G_UNLIKELY (response == GTK_RESPONSE_ACCEPT)) + xfce_shortcuts_provider_reset_shortcut (other_provider, shortcut); + else + accepted = FALSE; } xfce_shortcut_free (other_shortcut); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits