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 b91f6e6..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);
@@ -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;
@@ -1072,3 +1073,70 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc)
                                              MODEST_UTILS_COUNTRY_MODEL_COLUMN_NAME, GTK_SORT_ASCENDING);
 }
 
+GList *
+modest_utils_create_notification_list_from_header_list (TnyList *header_list)
+{
+       GList *new_headers_list;
+       TnyIterator *iter;
+
+       g_return_val_if_fail (TNY_IS_LIST (header_list), NULL);
+       g_return_val_if_fail (tny_list_get_length (header_list) > 0, NULL);
+
+       new_headers_list = NULL;
+       iter = tny_list_create_iterator (header_list);
+       while (!tny_iterator_is_done (iter)) {
+               ModestMsgNotificationData *data;
+               TnyHeader *header;
+               TnyFolder *folder;
+
+               header = (TnyHeader *) tny_iterator_get_current (iter);
+               if (header) {
+                       folder = tny_header_get_folder (header);
+
+                       if (folder) {
+                               gchar *uri, *uid;
+
+                               uid = tny_header_dup_uid (header);
+                               uri = g_strdup_printf ("%s/%s",
+                                                      tny_folder_get_url_string (folder),
+                                                      uid);
+                               g_free (uid);
+
+                               /* Create data & add to list */
+                               data = g_slice_new0 (ModestMsgNotificationData);
+                               data->subject = tny_header_dup_subject (header);
+                               data->from = tny_header_dup_from (header);
+                               data->uri = uri;
+
+                               new_headers_list = g_list_append (new_headers_list, data);
+
+                               g_object_unref (folder);
+                       }
+                       g_object_unref (header);
+               }
+               tny_iterator_next (iter);
+       }
+       g_object_unref (iter);
+
+       return new_headers_list;
+}
+
+static void
+free_notification_data (gpointer data,
+                       gpointer user_data)
+{
+       ModestMsgNotificationData *notification_data  = (ModestMsgNotificationData *) data;
+
+       g_free (notification_data->from);
+       g_free (notification_data->subject);
+       g_free (notification_data->uri);
+}
+
+void
+modest_utils_free_notification_list (GList *notification_list)
+{
+       g_return_if_fail (g_list_length (notification_list) > 0);
+
+       g_list_foreach (notification_list, free_notification_data, NULL);
+       g_list_free (notification_list);
+}