[Xfce4-commits] <xfce4-settings:master> Remove old shortuts from store when editing the key combo.

[Nick Schermer]

Updating branch refs/heads/master
         to eb1ac8a8b537239605e5b232fed0080b7e83c183 (commit)
       from 5b36cca041ef1cf448b48a31847dc41f94b4fef1 (commit)

commit eb1ac8a8b537239605e5b232fed0080b7e83c183
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Jan 6 20:14:40 2011 +0100

    Remove old shortuts from store when editing the key combo.
    
    Even though xfce_shortcuts_provider_reset_shortcut() is called,
    the combo is still sometimes shown in the list, so remove it
    directly when setting the new command and don't rely on
    xfce_keyboard_settings_shortcut_removed().

 dialogs/keyboard-settings/xfce-keyboard-settings.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 776d13a..cd33c9b 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -562,6 +562,7 @@ xfce_keyboard_settings_edit_shortcut (XfceKeyboardSettings *settings,
       if (G_LIKELY (response == GTK_RESPONSE_OK))
         {
           /* Remove old shortcut from the settings */
+          gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
           xfce_shortcuts_provider_reset_shortcut (settings->priv->provider, shortcut);
 
           /* Get the shortcut entered by the user */