aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/subscribe-dialog.c11
2 files changed, 13 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 364a440f56..85a6f46c08 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-26 Jeffrey Stedfast <fejj@ximian.com>
+
+ * subscribe-dialog.c (fe_got_children): If the CamelFolderInfo
+ node doesn't have \NoInferriors set, then check for
+ subfolders. Fixes bug #40314.
+
2003-03-26 Not Zed <NotZed@Ximian.com>
* mail-display.c (popup_window_destroy_cb): Undo jeff's patch
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index bf263b501a..0662eed8cd 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -118,7 +118,7 @@
*/
/* FIXME: we should disable/enable the subscribe/unsubscribe buttons as
- * appropriate when only a single message is selected. We need a
+ * appropriate when only a single folder is selected. We need a
* mechanism to learn when the selected folder's subscription status
* changes, so when the user double-clicks it (eg) the buttons can
* (de)sensitize appropriately. See Ximian bug #7673.
@@ -697,18 +697,21 @@ fe_got_children (CamelStore *store, char *prefix, CamelFolderInfo *info, gpointe
prefix = "";
for ( ; info; info = info->sibling) {
- ETreePath child_path;
+ ETreePath child_path;
ftree_node *node;
-
+
if (g_hash_table_lookup(closure->ftree->node_full_name, info->full_name))
continue;
-
+
node = ftree_node_new (store, info);
child_path = e_tree_memory_node_insert (E_TREE_MEMORY (closure->ftree),
closure->path,
0,
node);
g_hash_table_insert(closure->ftree->node_full_name, ftree_node_get_full_name(node), child_path);
+
+ if (!(info->flags & CAMEL_FOLDER_NOINFERIORS))
+ fe_check_for_children (closure->ftree, child_path);
}
#if 0