X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=2c4d531b301695811ba034dc9cb6e001f4fce789;hp=f5858d28bc02355cf40812913e3dde9da21bbc8b;hb=920f112a95118279b8d6b1430a059ad64dba4180;hpb=a5ff3fc2f46a52d474c7a4776a29d1fda8cfb0e1

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index f5858d2..2c4d531 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -502,15 +502,28 @@ static void
 convert_parent_folders_to_dots (gchar **item_name)
 {
 	gint n_parents = 0;
+	gint n_inbox_parents = 0;
 	gchar *c;
+	gchar *path_start;
 	gchar *last_separator;
 
 	if (item_name == NULL)
 		return;
 
+	path_start = *item_name;
 	for (c = *item_name; *c != '\0'; c++) {
 		if (g_str_has_prefix (c, MODEST_FOLDER_PATH_SEPARATOR)) {
+			gchar *compare;
+			if (c != path_start) {
+				compare = g_strndup (path_start, c - path_start);
+				compare = g_strstrip (compare);
+				if (g_ascii_strcasecmp (compare, "inbox") == 0) {
+					n_inbox_parents++;
+				}
+				g_free (compare);
+			}
 			n_parents++;
+			path_start = c + 1;
 		}
 	}
 
@@ -524,7 +537,7 @@ convert_parent_folders_to_dots (gchar **item_name)
 		gint i;
 
 		buffer = g_string_new ("");
-		for (i = 0; i < n_parents; i++) {
+		for (i = 0; i < n_parents - n_inbox_parents; i++) {
 			buffer = g_string_append (buffer, MODEST_FOLDER_DOT);
 		}
 		buffer = g_string_append (buffer, last_separator);
@@ -905,15 +918,20 @@ get_composite_icons (const gchar *icon_code,
 {
 	ThreePixbufs *retval;
 
-	if (!*pixbuf)
-		*pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE));
+	if (!*pixbuf) {
+		GdkPixbuf *icon;
+		icon = modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE);
+		if (icon) {
+			*pixbuf = gdk_pixbuf_copy (icon);
+		}
+	}
 
-	if (!*pixbuf_open)
+	if (!*pixbuf_open && pixbuf && *pixbuf)
 		*pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp",
 						     FOLDER_ICON_SIZE,
 						     *pixbuf);
 
-	if (!*pixbuf_close)
+	if (!*pixbuf_close && pixbuf && *pixbuf)
 		*pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp",
 						      FOLDER_ICON_SIZE,
 						      *pixbuf);
@@ -1024,7 +1042,7 @@ get_folder_icons (ModestFolderView *folder_view, TnyFolderType type, GObject *in
 	    type != TNY_FOLDER_TYPE_INBOX &&
 	    modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (instance))) {
 #ifdef MODEST_TOOLKIT_HILDON2
-		return get_composite_icons (MODEST_FOLDER_ICON_ACCOUNT,
+		return get_composite_icons (MODEST_FOLDER_ICON_REMOTE_FOLDER,
 					    &anorm_pixbuf,
 					    &anorm_pixbuf_open,
 					    &anorm_pixbuf_close);
@@ -2639,6 +2657,51 @@ compare_accounts_first (TnyFolderStore *s1, TnyFolderStore *s2)
 	return is_account2 - is_account1;
 }
 
+static gint
+compare_folders (const gchar *name1, const gchar *name2)
+{
+	const gchar *separator1, *separator2;
+	const gchar *next1, *next2;
+	gchar *top1, *top2;
+	gint cmp;
+
+	if (name1 == NULL || name1[0] == '\0')
+		return -1;
+	if (name2 == NULL || name2[0] == '\0')
+		return 1;
+
+	separator1 = strstr (name1, MODEST_FOLDER_PATH_SEPARATOR);
+	if (separator1) {
+		top1 = g_strndup (name1, separator1 - name1);
+	} else {
+		top1 = g_strdup (name1);
+	}
+
+	separator2 = strstr (name2, MODEST_FOLDER_PATH_SEPARATOR);
+	if (separator2) {
+		top2 = g_strndup (name2, separator2 - name2);
+	} else {
+		top2 = g_strdup (name2);
+	}
+
+
+	cmp = modest_text_utils_utf8_strcmp (top1, top2, TRUE);
+	g_free (top1);
+	g_free (top2);
+
+	if (cmp != 0)
+		return cmp;
+
+	if (separator1 == NULL && separator2 == NULL)
+		return 0;
+
+	next1 = (separator1 != NULL)?separator1 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
+	next2 = (separator2 != NULL)?separator2 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
+
+	return compare_folders (next1, next2);
+}
+
+
 /*
  * This function orders the mail accounts according to these rules:
  * 1st - remote accounts
@@ -2694,7 +2757,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 	}
 
 	/* Pure sort by name */
-	cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+	cmp = compare_folders (name1, name2);
  finish:
 	if (folder1)
 		g_object_unref(G_OBJECT(folder1));