X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=b2ed82f6ad5749c1cb34e2b1cb140e4c968ba418;hb=c17a6e8e45a7e36ea1c4ac2841f081c4e34d651e;hp=76cb85339730ff1ce932dc87a17ca8265619501c;hpb=02b54fd7fc8dbc7e12d9d580ac8f7107bad5fe1b;p=modest

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 76cb853..b2ed82f 100644
--- 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>
@@ -158,6 +159,7 @@ save_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name)
 	modest_conf_set_int (conf, key, width, NULL);
 	g_free (key);
 
+#ifndef MODEST_TOOLKIT_HILDON2
 	/* Save also the main window style */
 	if (MODEST_IS_MAIN_WINDOW (win)) {
 		ModestMainWindowStyle style = modest_main_window_get_style (MODEST_MAIN_WINDOW (win));
@@ -166,7 +168,7 @@ save_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name)
 		modest_conf_set_int (conf, key, style, NULL);
 		g_free (key);
 	}
-	
+#endif
 	return TRUE;
 }
 
@@ -199,6 +201,7 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name)
 		gtk_window_set_default_size (win, width, height);
 #endif
 
+#ifndef MODEST_TOOLKIT_HILDON2
 	/* Restore also the main window style */
 	if (MODEST_IS_MAIN_WINDOW (win)) {
 		ModestMainWindowStyle style;
@@ -210,6 +213,7 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name)
 			g_free (key);
 		}
 	}
+#endif
 
 	return TRUE;
 }
@@ -450,16 +454,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 +494,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;