Fix modest_tny_msg_header_get_all_recipients_list (in case from is empty)

[modest] / src / modest-utils.c

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 3d82fc6..c6e50e7 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -742,28 +742,6 @@ modest_utils_get_account_name_from_recipient (const gchar *from_header, gchar **
                        break;
                }
 
-               from = 
-                       modest_account_mgr_get_from_string (mgr, node->data, NULL);
-                       
-               if (from) {
-                       gchar *from_email = 
-                               modest_text_utils_get_email_address (from);
-                       gchar *from_header_email =
-                               modest_text_utils_get_email_address (from_header);
-                               
-                       if (from_email && from_header_email) {
-                               if (!modest_text_utils_utf8_strcmp (from_header_email, from_email, TRUE)) {
-                                       account_name = g_strdup (node->data);
-                                       g_free (from);
-                                       g_free (from_email);
-                                       break;
-                               }
-                       }
-                       g_free (from_email);
-                       g_free (from_header_email);
-                       g_free (from);
-               }
-
                transport_account = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (),
                                                                                (const gchar *) node->data,
                                                                                TNY_ACCOUNT_TYPE_TRANSPORT);
@@ -800,6 +778,29 @@ modest_utils_get_account_name_from_recipient (const gchar *from_header, gchar **
                }
                if (mailbox && *mailbox)
                        break;
+
+               from = 
+                       modest_account_mgr_get_from_string (mgr, node->data, NULL);
+                       
+               if (from) {
+                       gchar *from_email = 
+                               modest_text_utils_get_email_address (from);
+                       gchar *from_header_email =
+                               modest_text_utils_get_email_address (from_header);
+                               
+                       if (from_email && from_header_email) {
+                               if (!modest_text_utils_utf8_strcmp (from_header_email, from_email, TRUE)) {
+                                       account_name = g_strdup (node->data);
+                                       g_free (from);
+                                       g_free (from_email);
+                                       break;
+                               }
+                       }
+                       g_free (from_email);
+                       g_free (from_header_email);
+                       g_free (from);
+               }
+
                        
        }
        g_slist_foreach (accounts, (GFunc) g_free, NULL);
@@ -1042,7 +1043,7 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc)
 
                if (mcc == previous_mcc ||
                    g_hash_table_lookup (country_hash, country)) {
-                       g_message ("already seen: '%s' %d", country, mcc);
+                       g_debug ("already seen: '%s' %d", country, mcc);
                        continue;
                }
                previous_mcc = mcc;