* Fixes NB#91689. fixes a wrong check for ASCII

[modest] / src / modest-utils.c

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 67a4b02..aceeafb 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -714,7 +714,7 @@ modest_utils_run_sort_dialog (GtkWindow *parent_window,
        if (dialog == NULL)
                return;
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
-                                    GTK_WINDOW (dialog));
+                                    GTK_WINDOW (dialog), parent_window);
 
        /* Fill sort keys */
        switch (type) {
@@ -764,16 +764,19 @@ modest_utils_get_account_name_from_recipient (const gchar *from_header)
                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) {
-                               if (!modest_text_utils_utf8_strcmp (from_header, from_email, TRUE)) {
+                       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_email);
+                       g_free (from_header_email);
                        g_free (from);
                }
        }