aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2004-04-29 03:13:14 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-04-29 03:13:14 +0800
commitb1e8a79cad8a88193a2d258aaf77e51f7dbed7e6 (patch)
tree613920a74b56a600a7437ef8ea46e2c3891d9ebc
parent10c99a5bb240d219151287bc40a98ac57913b3f4 (diff)
downloadgsoc2013-evolution-b1e8a79cad8a88193a2d258aaf77e51f7dbed7e6.tar.gz
gsoc2013-evolution-b1e8a79cad8a88193a2d258aaf77e51f7dbed7e6.tar.zst
gsoc2013-evolution-b1e8a79cad8a88193a2d258aaf77e51f7dbed7e6.zip
Sort the VFolders. Fixes bug #56636.
2004-04-28 Jeffrey Stedfast <fejj@ximian.com> * em-folder-tree-model.c (sort_cb): Sort the VFolders. Fixes bug #56636. svn path=/trunk/; revision=25672
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/em-folder-tree-model.c30
2 files changed, 4 insertions, 29 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9c28ab805f..8092ee0753 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2004-04-28 Jeffrey Stedfast <fejj@ximian.com>
+ * em-folder-tree-model.c (sort_cb): Sort the VFolders. Fixes bug
+ #56636.
+
* em-mailer-prefs.c (citation_color_set): We only want 8bits per
color. Fixes bug #57588.
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 7800da1eef..00732ef635 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -198,39 +198,11 @@ sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data
if (!strcmp (bname, _("VFolders")))
return -1;
} else if (store == vfolder_store) {
- /* perform no sorting, we want to display in the same
- * order as they appear in the VFolder editor - UNMATCHED is always last */
- GtkTreePath *path;
- int ret;
-
+ /* UNMATCHED is always last */
if (aname && !strcmp (aname, _("UNMATCHED")))
return 1;
if (bname && !strcmp (bname, _("UNMATCHED")))
return -1;
-
- path = gtk_tree_model_get_path (model, a);
- if (path) {
- aname = gtk_tree_path_to_string (path);
- gtk_tree_path_free (path);
- } else {
- return 1;
- }
-
- path = gtk_tree_model_get_path (model, b);
- if (path) {
- bname = gtk_tree_path_to_string (path);
- gtk_tree_path_free (path);
- } else {
- g_free(aname);
- return -1;
- }
-
- ret = strcmp (aname, bname);
-
- g_free (aname);
- g_free (bname);
-
- return ret;
} else {
/* Inbox is always first */
if (aname && (!strcmp (aname, "INBOX") || !strcmp (aname, _("Inbox"))))