Do ignore empty recipients when checking names

[modest] / src / modest-widget-memory.c

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 76cb853..617dfd6 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -27,6 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <modest-defs.h>
 #include <modest-widget-memory.h>
 #include <modest-widget-memory-priv.h>
 #include <modest-runtime.h>
@@ -450,16 +451,14 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        }
 
        if (sort_colid >= 0) {
-         GtkTreeModel *sortable = 
-                 gtk_tree_model_filter_get_model (
-                         GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))));
+               GtkTreeModel *sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
                if (sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN)
                        modest_header_view_sort_by_column_id (header_view, 0, sort_type);
-               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
                                                      sort_colid,
                                                      sort_type);
                modest_header_view_sort_by_column_id (header_view, sort_colid, sort_type);
-               gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE(sortable));
+               gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE (sortable));
        }
 
        g_free (key);
@@ -492,16 +491,22 @@ restore_settings_folder_view (ModestConf *conf,
        default_acc = modest_account_mgr_get_default_account (mgr);
        if (default_acc) {
                ModestAccountSettings *settings;
-               ModestServerAccountSettings *store_settings;
                const gchar *server_acc_id;
 
                settings = modest_account_mgr_load_account_settings (mgr, (const gchar*) default_acc);
-               store_settings = modest_account_settings_get_store_settings (settings);
-               server_acc_id = modest_server_account_settings_get_account_name (store_settings);
-
-               modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id);
-               g_object_unref (store_settings);
-               g_object_unref (settings);
+               /* If there was any problem with the settings storage
+                  the settings could be NULL */
+               if (settings) {
+                       ModestServerAccountSettings *store_settings;
+                       store_settings = modest_account_settings_get_store_settings (settings);
+
+                       if (store_settings) {
+                               server_acc_id = modest_server_account_settings_get_account_name (store_settings);
+                               modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id);
+                               g_object_unref (store_settings);
+                       }
+                       g_object_unref (settings);
+               }
                g_free (default_acc);
        }
        return TRUE;