Updating branch refs/heads/master
to 0b39613666ee95df3dbba6a5c9d1470799104a34 (commit)
from 993d61b8585607913b21af6b81f74cc94bcb9db5 (commit)
commit 0b39613666ee95df3dbba6a5c9d1470799104a34
Author: Jérôme Guelfucci <jero...@xfce.org>
Date: Thu Dec 27 11:28:16 2012 +0100
Show shortcut label when editing a shortcut.
dialogs/keyboard-settings/xfce-keyboard-settings.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 6880d95..a7529c8 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -1084,12 +1084,14 @@ xfce_keyboard_settings_edit_button_clicked
(XfceKeyboardSettings *settings)
GtkWidget *command_dialog;
gboolean finished;
gboolean snotify;
+ gchar *shortcut_label;
gchar *shortcut;
gchar *command;
gint response;
/* Read row values */
gtk_tree_model_get (model, &iter,
+ SHORTCUT_LABEL_COLUMN, &shortcut_label,
SHORTCUT_COLUMN, &shortcut,
COMMAND_COLUMN, &command,
SNOTIFY_COLUMN, &snotify,
@@ -1098,7 +1100,7 @@ xfce_keyboard_settings_edit_button_clicked
(XfceKeyboardSettings *settings)
DBG ("Edit shortcut %s / command %s", shortcut, command);
/* Create command dialog */
- command_dialog = command_dialog_new (shortcut, command, snotify);
+ command_dialog = command_dialog_new (shortcut_label, command,
snotify);
/* Run command dialog until a valid (non-empty) command is entered
or the dialog is cancelled */
do
@@ -1187,6 +1189,7 @@ xfce_keyboard_settings_edit_button_clicked
(XfceKeyboardSettings *settings)
gtk_widget_destroy (shortcut_dialog);
}
+ g_free (shortcut_label);
g_free (shortcut);
g_free (command);
gtk_widget_destroy (command_dialog);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
