aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/folder-browser-ui.c2
-rw-r--r--mail/subscribe-dialog.c15
3 files changed, 24 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4f0739680c..1ba972f910 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2001-08-16 Peter Williams <peterw@ximian.com>
+ * subscribe-dialog.c (fe_got_children): Sort the nodes here...
+ (fe_sort_folder): ... using this function.
+
+ * folder-browser-ui.c (folder_browser_ui_message_loaded): Check for uic
+ == NULL. I'm not sure how this could happen, but...
+
+2001-08-16 Peter Williams <peterw@ximian.com>
+
* folder-browser-ui.c (folder_browser_ui_set_selection_state): Disable
"Search Message" when more or less than exactly one message is selected.
diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c
index b125da4450..27eeafb699 100644
--- a/mail/folder-browser-ui.c
+++ b/mail/folder-browser-ui.c
@@ -511,6 +511,6 @@ folder_browser_ui_message_loaded (FolderBrowser *fb)
{
BonoboUIComponent *uic = fb->uicomp;
- if (fb->loaded_uid == NULL)
+ if (fb->loaded_uid == NULL && uic)
fbui_sensitize_items (uic, message_pane_enables, TRUE);
}
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index 9b157179a7..7d5a07001a 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -663,6 +663,17 @@ fe_return_false (void)
return FALSE;
}
+static gint
+fe_sort_folder (ETreeMemory *etmm, ETreePath left, ETreePath right, gpointer user_data)
+{
+ ftree_node *n_left, *n_right;
+
+ n_left = e_tree_memory_node_get_data (etmm, left);
+ n_right = e_tree_memory_node_get_data (etmm, right);
+
+ return g_strcasecmp (ftree_node_get_name (n_left), ftree_node_get_name (n_right));
+}
+
/* scanning */
static void
@@ -688,6 +699,10 @@ fe_got_children (CamelStore *store, gchar *prefix, CamelFolderInfo *info, gpoint
closure->path,
0,
node);
+ e_tree_memory_sort_node (E_TREE_MEMORY (closure->ftree),
+ closure->path,
+ fe_sort_folder,
+ NULL);
}
if (closure->data)