* src/maemo/modest-msg-view-window.c:

[modest] / src / modest-tny-folder.c

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 9b13e75..e885244 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -45,17 +45,23 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* name)
 {
        gint  type;
        gchar *folder;
+       gchar *dc_outbox = NULL;
+       gchar *dc_sent = NULL;
+       gchar *dc_drafts = NULL;
 
        g_return_val_if_fail (name, TNY_FOLDER_TYPE_UNKNOWN);
        
        type = TNY_FOLDER_TYPE_UNKNOWN;
        folder = g_utf8_strdown (name, strlen(name));
+       dc_outbox = g_utf8_strdown (_("mcen_me_folder_outbox"), -1);
+       dc_sent = g_utf8_strdown (_("mcen_me_folder_sent"), -1);
+       dc_drafts = g_utf8_strdown (_("mcen_me_folder_drafts"), -1);
 
 //     if (strcmp (folder, "inbox") == 0 ||
 //         strcmp (folder, _("inbox")) == 0 ||
 //         strcmp (folder, _("mcen_me_folder_inbox")) == 0)
 //             type = TNY_FOLDER_TYPE_INBOX;
-       if (strcmp (folder, _("mcen_me_folder_outbox")) == 0)
+       if (strcmp (folder, dc_outbox) == 0)
                type = TNY_FOLDER_TYPE_OUTBOX;
 //     else if (g_str_has_prefix(folder, "junk") ||
 //              g_str_has_prefix(folder, _("junk")))
@@ -63,9 +69,9 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* name)
 //     else if (g_str_has_prefix(folder, "trash") ||
 //              g_str_has_prefix(folder, _("trash")))
 //             type = TNY_FOLDER_TYPE_TRASH;
-       else if (strcmp (folder, _("mcen_me_folder_sent")) == 0)
+       else if (strcmp (folder, dc_sent) == 0)
                type = TNY_FOLDER_TYPE_SENT;
-       else if (strcmp (folder, _("mcen_me_folder_drafts")) == 0)
+       else if (strcmp (folder, dc_drafts) == 0)
                type = TNY_FOLDER_TYPE_DRAFTS;
 //     else if (g_str_has_prefix(folder, "notes") ||
 //              g_str_has_prefix(folder, _("notes")))
@@ -78,6 +84,9 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* name)
 //             type = TNY_FOLDER_TYPE_CALENDAR;
        
        g_free (folder);
+       g_free (dc_outbox);
+       g_free (dc_sent);
+       g_free (dc_drafts);
        return type;
 }
 
@@ -378,28 +387,50 @@ modest_tny_folder_get_account (TnyFolder *folder)
        return account;
 }
 
+/*
+ * It's probably better to use a query to get the folders that match
+ * new_name but currently tinymail only provides a match by name using
+ * regular expressions and we want an exact matching. We're not using
+ * a regular expression for the exact name because we'd need first to
+ * escape @new_name and it's not easy sometimes. 
+ *
+ * The code that uses the query is available in revision 3152.
+ */
 gboolean 
 modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
-                                          const gchar *name)
+                                          const gchar *new_name)
 {
-       TnyList *list;
-       TnyFolderStoreQuery *query;
-       guint length;
+       TnyList *subfolders = NULL;
+       TnyIterator *iter = NULL;
+       TnyFolder *folder = NULL;
+       GError *err = NULL;
+       gboolean same_subfolder = FALSE;
 
        g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), FALSE);
-       g_return_val_if_fail (name, FALSE);
 
-       /* Create the query */
-       list = tny_simple_list_new ();
-       query = tny_folder_store_query_new ();
-       tny_folder_store_query_add_item (query, name,
-                                        TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME);
+       /* Get direct subfolders */
+       subfolders = tny_simple_list_new ();
+       tny_folder_store_get_folders (parent, subfolders, NULL, &err);
 
-       /* Get subfolders */
-       tny_folder_store_get_folders (parent, list, query, NULL);       
-       length = tny_list_get_length (list);
-       g_object_unref (query);
-       g_object_unref (list);
+       /* Check names */
+       iter = tny_list_create_iterator (subfolders);
+       while (!tny_iterator_is_done (iter) && !same_subfolder) {
+               const gchar *name = NULL;
+
+               folder = TNY_FOLDER(tny_iterator_get_current (iter));
+               name = tny_folder_get_name (folder);
+               
+               same_subfolder = !strcmp(name, new_name);
 
-       return (length > 0) ? TRUE : FALSE;
+               g_object_unref (folder);
+               tny_iterator_next(iter);
+       }
+       
+       /* free */
+       if (iter != NULL)
+               g_object_unref (iter);
+       if (subfolders != NULL)
+               g_object_unref (subfolders);
+               
+       return same_subfolder;
 }