* Fixes NB#63001, now we get errors if the SMTP connection fails

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

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 62cf9f7..c913436 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;
 }
 
@@ -291,13 +300,9 @@ modest_tny_folder_get_local_or_mmc_folder_type  (TnyFolder *folder)
         * _full name_, that is, the full path name of the folder,
         * to distinguish between 'Outbox' and 'myfunkyfolder/Outbox'
         */
-       CamelFolder *camel_folder = tny_camel_folder_get_folder (TNY_CAMEL_FOLDER(folder));
-       if (!camel_folder)
-               return TNY_FOLDER_TYPE_UNKNOWN;
 
-       const gchar *full_name = camel_folder_get_full_name (camel_folder);
+       const gchar *full_name = tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder));
        /* printf ("DEBUG: %s: full_name=%s\n", __FUNCTION__, full_name); */
-       camel_object_unref (CAMEL_OBJECT(camel_folder));
        
        if (!full_name) 
                return TNY_FOLDER_TYPE_UNKNOWN;
@@ -315,25 +320,6 @@ modest_tny_folder_is_outbox_for_account (TnyFolder *folder, TnyAccount *account)
                return FALSE;
                
        return TRUE;
-#if 0  
-       /* we need to use the camel functions, because we want the
-        * _full name_, that is, the full path name of the folder,
-        * to distinguis between 'Outbox' and 'myfunkyfolder/Outbox'
-        */
-       CamelFolder *camel_folder = tny_camel_folder_get_folder (TNY_CAMEL_FOLDER(folder));
-       if (!camel_folder)
-               return FALSE;
-
-       const gchar *full_name = camel_folder_get_full_name (camel_folder);
-       camel_object_unref (CAMEL_OBJECT(camel_folder));
-       
-       if (!full_name) 
-               return TNY_FOLDER_TYPE_UNKNOWN;
-       else 
-               return modest_local_folder_info_get_type (full_name);
-               
-       return FALSE;
-#endif
 }
 
 gchar*