From e774bd7f2d66feae1508f52988585347ae0fcbc8 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 17 Sep 2002 19:27:04 +0000 Subject: [Fix #28451.] * e-storage-set-view.c: New member sort_idle_id in EStorageSetViewPrivate. (init): Init to zero. (impl_destroy): Remove the idle source if not zero. (queue_resort): New. (sort_idle_callback): Idle function to sort. (setup_folder_changed_callback): New. (new_folder_cb): Call it on the new folder so we get the callback for new folders too. (popup_folder_menu): Ref the folder before popping up the menu, unref it after popping it down [the folder might be unreffed in gnome_popup_menu_do_popup_modal() because of a folder action]. (new_storage_cb): Just queue_resort() instead of sorting. (new_folder_cb): Likewise. (insert_folders): Likewise. (insert_storages): Likewise. (folder_changed_cb): Queue a resort here too. * e-folder.c (class_init): Set up "name_changed" signal. (e_folder_set_name): Emit "name_changed". * e-folder.h: New signal "name_changed". svn path=/trunk/; revision=18093 --- shell/ChangeLog | 27 +++++++++ shell/e-folder.c | 9 +++ shell/e-folder.h | 1 + shell/e-storage-set-view.c | 135 ++++++++++++++++++++++++++++++++++++++------- 4 files changed, 151 insertions(+), 21 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index b29c5dbf51..7218689dbc 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,30 @@ +2002-09-17 Ettore Perazzoli + + [Fix #28451.] + + * e-storage-set-view.c: New member sort_idle_id in + EStorageSetViewPrivate. + (init): Init to zero. + (impl_destroy): Remove the idle source if not zero. + (queue_resort): New. + (sort_idle_callback): Idle function to sort. + (setup_folder_changed_callback): New. + (new_folder_cb): Call it on the new folder so we get the callback + for new folders too. + (popup_folder_menu): Ref the folder before popping up the menu, + unref it after popping it down [the folder might be unreffed in + gnome_popup_menu_do_popup_modal() because of a folder action]. + (new_storage_cb): Just queue_resort() instead of sorting. + (new_folder_cb): Likewise. + (insert_folders): Likewise. + (insert_storages): Likewise. + (folder_changed_cb): Queue a resort here too. + + * e-folder.c (class_init): Set up "name_changed" signal. + (e_folder_set_name): Emit "name_changed". + + * e-folder.h: New signal "name_changed". + 2002-09-17 Kjartan Maraas * e-shell-settings-dialog.c (page_new): Invoke gettext on diff --git a/shell/e-folder.c b/shell/e-folder.c index 64083a6d31..2910963deb 100644 --- a/shell/e-folder.c +++ b/shell/e-folder.c @@ -68,6 +68,7 @@ struct _EFolderPrivate { enum { CHANGED, + NAME_CHANGED, LAST_SIGNAL }; @@ -148,6 +149,13 @@ class_init (EFolderClass *klass) gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); + signals[NAME_CHANGED] = gtk_signal_new ("name_changed", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET (EFolderClass, name_changed), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); klass->save_info = save_info; @@ -336,6 +344,7 @@ e_folder_set_name (EFolder *folder, g_free (folder->priv->name); folder->priv->name = g_strdup (name); + gtk_signal_emit (GTK_OBJECT (folder), signals[NAME_CHANGED]); gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); } diff --git a/shell/e-folder.h b/shell/e-folder.h index 3a7d5ea42f..bf7db6c063 100644 --- a/shell/e-folder.h +++ b/shell/e-folder.h @@ -60,6 +60,7 @@ struct _EFolderClass { /* Signals. */ void (* changed) (EFolder *folder); + void (* name_changed) (EFolder *folder); }; diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 618f27f4cf..a0c9b1a80a 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -117,6 +117,9 @@ struct _EStorageSetViewPrivate { not, when show_checkboxes is TRUE. */ EStorageSetViewHasCheckBoxFunc has_checkbox_func; void *has_checkbox_func_data; + + /* Sorting idle function. */ + int sort_idle_id; }; @@ -132,6 +135,13 @@ enum { static unsigned int signals[LAST_SIGNAL] = { 0 }; + +/* Forward declarations. */ + +static void setup_folder_changed_callbacks (EStorageSetView *storage_set_view, + EFolder *folder, + const char *path); + /* DND stuff. */ @@ -145,7 +155,7 @@ typedef enum _DndTargetType DndTargetType; #define E_SHORTCUT_TYPE "E-SHORTCUT" -/* Sorting callbacks. */ +/* Sorting. */ static int storage_sort_callback (ETreeMemory *etmm, @@ -214,6 +224,56 @@ folder_sort_callback (ETreeMemory *etmm, return +1; } +static gboolean +sort_traverse_callback (ETreeModel *model, + ETreePath node, + void *data) +{ + EStorageSetView *storage_set_view; + EStorageSetViewPrivate *priv; + + storage_set_view = E_STORAGE_SET_VIEW (data); + priv = storage_set_view->priv; + + e_tree_memory_sort_node (E_TREE_MEMORY (model), node, + folder_sort_callback, storage_set_view); + + return FALSE; +} + +static int +sort_idle_callback (void *data) +{ + EStorageSetView *storage_set_view; + EStorageSetViewPrivate *priv; + static int i; + + storage_set_view = E_STORAGE_SET_VIEW (data); + priv = storage_set_view->priv; + + e_tree_memory_sort_node (E_TREE_MEMORY (priv->etree_model), priv->root_node, + storage_sort_callback, storage_set_view); + + e_tree_model_node_traverse (priv->etree_model, priv->root_node, + sort_traverse_callback, storage_set_view); + + priv->sort_idle_id = 0; + return FALSE; +} + +static void +queue_resort (EStorageSetView *storage_set_view) +{ + EStorageSetViewPrivate *priv; + + priv = storage_set_view->priv; + + if (priv->sort_idle_id != 0) + return; + + priv->sort_idle_id = g_idle_add (sort_idle_callback, storage_set_view); +} + /* Helper functions. */ @@ -776,6 +836,7 @@ popup_folder_menu (EStorageSetView *storage_set_view, priv = storage_set_view->priv; folder = e_storage_set_get_folder (priv->storage_set, priv->right_click_row_path); + gtk_object_ref (GTK_OBJECT (folder)); folder_type_registry = e_storage_set_get_folder_type_registry (priv->storage_set); g_assert (folder_type_registry != NULL); @@ -811,6 +872,7 @@ popup_folder_menu (EStorageSetView *storage_set_view, e_folder_get_physical_uri (folder), e_folder_get_type_string (folder)); + gtk_object_unref (GTK_OBJECT (folder)); gtk_widget_destroy (GTK_WIDGET (menu)); e_tree_right_click_up (E_TREE (storage_set_view)); @@ -883,6 +945,9 @@ impl_destroy (GtkObject *object) /* (No unreffing for priv->ui_container since we use a weakref.) */ + if (priv->sort_idle_id != 0) + g_source_remove (priv->sort_idle_id); + g_free (priv->selected_row_path); g_free (priv->right_click_row_path); @@ -1148,7 +1213,7 @@ impl_tree_drag_motion (ETree *tree, return FALSE; folder_path = e_tree_memory_node_get_data (E_TREE_MEMORY (priv->etree_model), - e_tree_node_at_row (E_TREE (storage_set_view), row)); + e_tree_node_at_row (E_TREE (storage_set_view), row)); if (folder_path == NULL) return FALSE; @@ -1641,8 +1706,8 @@ new_storage_cb (EStorageSet *storage_set, path = g_strconcat (E_PATH_SEPARATOR_S, e_storage_get_name (storage), NULL); node = e_tree_memory_node_insert (E_TREE_MEMORY(priv->etree_model), priv->root_node, -1, path); - e_tree_memory_sort_node (E_TREE_MEMORY(priv->etree_model), priv->root_node, - storage_sort_callback, storage_set_view); + + queue_resort (storage_set_view); if (! add_node_to_hash (storage_set_view, path, node)) { e_tree_memory_node_remove (E_TREE_MEMORY(priv->etree_model), node); @@ -1707,12 +1772,17 @@ new_folder_cb (EStorageSet *storage_set, copy_of_path = g_strdup (path); new_node = e_tree_memory_node_insert (E_TREE_MEMORY(etree), parent_node, -1, copy_of_path); - e_tree_memory_sort_node (E_TREE_MEMORY(etree), parent_node, folder_sort_callback, storage_set_view); + + queue_resort (storage_set_view); if (! add_node_to_hash (storage_set_view, path, new_node)) { e_tree_memory_node_remove (E_TREE_MEMORY(etree), new_node); return; } + + setup_folder_changed_callbacks (storage_set_view, + e_storage_set_get_folder (storage_set, path), + path); } static void @@ -1889,6 +1959,8 @@ init (EStorageSetView *storage_set_view) priv->has_checkbox_func = NULL; priv->has_checkbox_func_data = NULL; + priv->sort_idle_id = 0; + storage_set_view->priv = priv; } @@ -1936,6 +2008,38 @@ folder_changed_cb (EFolder *folder, e_tree_model_node_data_changed (priv->etree_model, node); } +static void +folder_name_changed_cb (EFolder *folder, + void *data) +{ + queue_resort (E_STORAGE_SET_VIEW (data)); +} + +static void +setup_folder_changed_callbacks (EStorageSetView *storage_set_view, + EFolder *folder, + const char *path) +{ + FolderChangedCallbackData *folder_changed_callback_data; + + folder_changed_callback_data = g_new (FolderChangedCallbackData, 1); + folder_changed_callback_data->storage_set_view = storage_set_view; + folder_changed_callback_data->path = g_strdup (path); + + gtk_signal_connect_while_alive (GTK_OBJECT (folder), "name_changed", + GTK_SIGNAL_FUNC (folder_name_changed_cb), + storage_set_view, + GTK_OBJECT (storage_set_view)); + + e_gtk_signal_connect_full_while_alive (GTK_OBJECT (folder), "changed", + GTK_SIGNAL_FUNC (folder_changed_cb), + NULL, + folder_changed_callback_data, + folder_changed_callback_data_destroy_notify, + FALSE, FALSE, + GTK_OBJECT (storage_set_view)); +} + static void insert_folders (EStorageSetView *storage_set_view, @@ -1960,7 +2064,6 @@ insert_folders (EStorageSetView *storage_set_view, return; for (p = folder_path_list; p != NULL; p = p->next) { - FolderChangedCallbackData *folder_changed_callback_data; EFolder *folder; const char *folder_name; const char *folder_path; @@ -1972,25 +2075,16 @@ insert_folders (EStorageSetView *storage_set_view, full_path = g_strconcat ("/", storage_name, folder_path, NULL); node = e_tree_memory_node_insert (E_TREE_MEMORY(etree), parent, -1, (void *) full_path); - e_tree_memory_sort_node(E_TREE_MEMORY(etree), parent, folder_sort_callback, storage_set_view); add_node_to_hash (storage_set_view, full_path, node); insert_folders (storage_set_view, node, storage, folder_path); - folder_changed_callback_data = g_new (FolderChangedCallbackData, 1); - folder_changed_callback_data->storage_set_view = storage_set_view; - folder_changed_callback_data->path = g_strdup (full_path); - - e_gtk_signal_connect_full_while_alive (GTK_OBJECT (folder), "changed", - GTK_SIGNAL_FUNC (folder_changed_cb), - NULL, - folder_changed_callback_data, - folder_changed_callback_data_destroy_notify, - FALSE, FALSE, - GTK_OBJECT (storage_set_view)); + setup_folder_changed_callbacks (storage_set_view, folder, full_path); } e_free_string_list (folder_path_list); + + queue_resort (storage_set_view); } static void @@ -2017,9 +2111,6 @@ insert_storages (EStorageSetView *storage_set_view) path = g_strconcat ("/", name, NULL); parent = e_tree_memory_node_insert (E_TREE_MEMORY(priv->etree_model), priv->root_node, -1, path); - e_tree_memory_sort_node (E_TREE_MEMORY(priv->etree_model), - priv->root_node, - storage_sort_callback, storage_set_view); g_hash_table_insert (priv->path_to_etree_node, path, parent); @@ -2028,6 +2119,8 @@ insert_storages (EStorageSetView *storage_set_view) } e_free_object_list (storage_list); + + queue_resort (storage_set_view); } void -- cgit v1.2.3