X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=c6e50e7b8dd6dbd9ea99af7bdeced43e5a4ecddb;hp=5f934c15c1575fa89597211ef69f7c15e2be7aa1;hb=aa2550dd7c4bd174d8953961d4ff64c3e88c01ad;hpb=059f215cec94c21c941a925b521f6c4bef640550

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 5f934c1..c6e50e7 100644
--- 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);
@@ -841,7 +842,7 @@ modest_utils_open_mcc_mapping_file (gboolean from_lc_messages, gboolean *transla
 		env_list = getenv ("LANG");
 	}
 	parts = g_strsplit (env_list, ":", 0);
-	gchar *path1;
+	gchar *path1 = NULL;
 	const gchar* path2 = MODEST_MCC_MAPPING;
 
 	if (translated)
@@ -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;