X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=fc882edfe1fa6d6c82521b4eb1eabad83f63561a;hp=8ad2bb9bc1101b0892cf959a217a4b301a480a6a;hb=07c0fefbd027f14c5c3c4c509f9b7e0e6970ffbd;hpb=8576d94968a6202c4a6b760d00213281baaa6b47

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 8ad2bb9..fc882ed 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>
@@ -37,7 +38,6 @@
 #include <widgets/modest-header-view.h>
 #include <widgets/modest-msg-view.h>
 #include <widgets/modest-folder-view.h>
-#include "widgets/modest-main-window.h"
 #include <string.h>
 
 gchar*
@@ -158,15 +158,6 @@ save_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name)
 	modest_conf_set_int (conf, key, width, NULL);
 	g_free (key);
 
-	/* Save also the main window style */
-	if (MODEST_IS_MAIN_WINDOW (win)) {
-		ModestMainWindowStyle style = modest_main_window_get_style (MODEST_MAIN_WINDOW (win));
-
-		key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WINDOW_STYLE);
-		modest_conf_set_int (conf, key, style, NULL);
-		g_free (key);
-	}
-	
 	return TRUE;
 }
 
@@ -199,17 +190,6 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name)
 		gtk_window_set_default_size (win, width, height);
 #endif
 
-	/* Restore also the main window style */
-	if (MODEST_IS_MAIN_WINDOW (win)) {
-		ModestMainWindowStyle style;
-
-		key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WINDOW_STYLE);
-		if (modest_conf_key_exists (conf, key, NULL)) {
-			style = (ModestMainWindowStyle) modest_conf_get_int (conf, key, NULL);		
-			modest_main_window_set_style (MODEST_MAIN_WINDOW (win), style);
-			g_free (key);
-		}
-	}
 
 	return TRUE;
 }
@@ -450,16 +430,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);