aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/Makefile.am4
-rw-r--r--shell/e-storage-set-view.c5
3 files changed, 16 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 8f017cc002..530d74037f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,15 @@
2000-10-02 Chris Toshok <toshok@helixcode.com>
+ * e-storage-set-view.c (e_storage_set_view_get_current_folder): if
+ we're not displaying folders, the current folder is NULL.
+ (class_init): fix typo.
+
+ * Makefile.am (libeshell_a_SOURCES):
+ evolution-storage-set-view-listener.[ch] should be here, not
+ evolution_SOURCES.
+
+2000-10-02 Chris Toshok <toshok@helixcode.com>
+
* evolution-storage-set-view.c: add storage_selected behavior -
loop over the listeners calling _storage_selected.
diff --git a/shell/Makefile.am b/shell/Makefile.am
index f2b1dd674d..aa3037bced 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -64,6 +64,8 @@ libeshell_a_SOURCES = \
evolution-shell-view.h \
evolution-storage-listener.c \
evolution-storage-listener.h \
+ evolution-storage-set-view-listener.c \
+ evolution-storage-set-view-listener.h \
evolution-storage.c \
evolution-storage.h
@@ -117,8 +119,6 @@ evolution_SOURCES = \
e-storage.h \
evolution-storage-set-view.c \
evolution-storage-set-view.h \
- evolution-storage-set-view-listener.c \
- evolution-storage-set-view-listener.h \
evolution-storage-set-view-factory.c \
evolution-storage-set-view-factory.h \
main.c
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index 040e2dc571..9c1ded128e 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -679,7 +679,7 @@ class_init (EStorageSetViewClass *klass)
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
- signals[FOLDER_SELECTED]
+ signals[STORAGE_SELECTED]
= gtk_signal_new ("storage_selected",
GTK_RUN_FIRST,
object_class->type,
@@ -1014,6 +1014,9 @@ e_storage_set_view_get_current_folder (EStorageSetView *storage_set_view)
priv = storage_set_view->priv;
+ if (!priv->show_folders)
+ return NULL; /* Mmh! */
+
row = e_table_get_cursor_row (E_TABLE (storage_set_view));
etree_node = e_tree_model_node_at_row (priv->etree_model, row);