From 8f366de2a4fb5c5bddab80667a821c1acee91c21 Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Tue, 5 Jun 2001 17:10:32 +0000 Subject: (Fixing bug #1299: Shell saves shortcuts when display name changes) 2001-06-04 Jason Leach (Fixing bug #1299: Shell saves shortcuts when display name changes) * e-shortcuts.c (class_init): New signal: "update_shortcut". * e-shortcuts-view-model.c (e_shortcuts_view_model_construct): Connect thew new signal here. * e-shortcuts-view-model.c (shortcuts_update_shortcut_cb): New function, uses the new e_shortcut_model_update_item(). * e-shell-view.c (corba_interface_set_folder_bar_label): Fix a warning here. svn path=/trunk/; revision=10116 --- shell/e-shortcuts.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'shell/e-shortcuts.c') diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index 5fae9cfb9d..3317dd4835 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -112,6 +112,7 @@ enum { REMOVE_GROUP, NEW_SHORTCUT, REMOVE_SHORTCUT, + UPDATE_SHORTCUT, LAST_SIGNAL }; @@ -435,6 +436,16 @@ class_init (EShortcutsClass *klass) GTK_TYPE_INT, GTK_TYPE_INT); + signals[UPDATE_SHORTCUT] + = gtk_signal_new ("update_shortcut", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET (EShortcutsClass, update_shortcut), + gtk_marshal_NONE__INT_INT, + GTK_TYPE_NONE, 2, + GTK_TYPE_INT, + GTK_TYPE_INT); + gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); } @@ -741,13 +752,8 @@ e_shortcuts_update_shortcut (EShortcuts *shortcuts, { g_return_if_fail (shortcuts != NULL); g_return_if_fail (E_IS_SHORTCUTS (shortcuts)); - - /* FIXME: need support in e-shortcut-bar widget (and also - e-icon-bar) to be able to "update" a shortcut without doing - this lame remove then add */ - e_shortcuts_remove_shortcut (shortcuts, group_num, num); - e_shortcuts_add_shortcut (shortcuts, group_num, num, uri); + gtk_signal_emit (GTK_OBJECT (shortcuts), signals[UPDATE_SHORTCUT], group_num, num); } -- cgit v1.2.3