From 17fd352c3b2ccbc9dcfc9d199e7363fe40cd379f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 7 Mar 2002 19:23:44 +0000 Subject: Addendum to previous commit: Remove "storage_selected" vs "folder_selected" distinction. * evolution-storage-set-view.c (storage_set_view_widget_storage_selected_cb): Removed. * evolution-storage-set-view-listener.c (impl_GNOME_Evolution_StorageSetViewListener_notifyStorageSelected): Removed. (class_init): Remove STORAGE_SELECTED signal. * e-storage-set-view.c (impl_cursor_activated): Always emit FOLDER_SELECTED, never STORAGE_SELECTED. (class_init): Remove STORAGE_SELECTED signal. * e-shell-view.c (storage_selected_cb): Removed. * e-shell-folder-creation-dialog.c (storage_set_view_storage_selected_cb): Removed. * Evolution-StorageSetView.idl (StorageSetViewListener): Remove notifyStorageSelected. svn path=/trunk/; revision=15968 --- shell/e-storage-set-view.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'shell/e-storage-set-view.c') diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 1c91ae6231..f3e8335ef5 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -101,7 +101,6 @@ struct _EStorageSetViewPrivate { enum { FOLDER_SELECTED, - STORAGE_SELECTED, DND_ACTION, FOLDER_CONTEXT_MENU_POPPING_UP, FOLDER_CONTEXT_MENU_POPPED_DOWN, @@ -1332,15 +1331,8 @@ impl_cursor_activated (ETree *tree, if (path) { priv->selected_row_path = g_strdup (e_tree_memory_node_get_data (E_TREE_MEMORY (priv->etree_model), path)); - if (e_tree_model_node_depth (priv->etree_model, path) >= 2) { - /* it was a folder */ - gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED], - priv->selected_row_path); - } else { - /* it was a storage */ - gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[STORAGE_SELECTED], - priv->selected_row_path + 1); - } + gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED], + priv->selected_row_path); } else priv->selected_row_path = NULL; @@ -1738,15 +1730,6 @@ class_init (EStorageSetViewClass *klass) GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - signals[STORAGE_SELECTED] - = gtk_signal_new ("storage_selected", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET (EStorageSetViewClass, storage_selected), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, - GTK_TYPE_STRING); - signals[DND_ACTION] = gtk_signal_new ("dnd_action", GTK_RUN_FIRST, -- cgit v1.2.3