* all:

[modest] / src / gtk / modest-main-window.c

diff --git a/src/gtk/modest-main-window.c b/src/gtk/modest-main-window.c
index 1f72df2..a6268a9 100644 (file)
--- a/src/gtk/modest-main-window.c
+++ b/src/gtk/modest-main-window.c
@@ -66,7 +66,7 @@ struct _ModestMainWindowPrivate {
        GtkUIManager *ui_manager;
        ModestWidgetFactory *widget_factory;
        TnyPlatformFactory *factory;
-       TnyAccountStore *account_store;
+       ModestTnyAccountStore *account_store;
        
        GtkWidget *toolbar;
        GtkWidget *menubar;
@@ -182,26 +182,13 @@ static ModestHeaderView*
 header_view_new (ModestMainWindow *self)
 {
        int i;
-       GList *columns = NULL;
        ModestHeaderView *header_view;
        ModestMainWindowPrivate *priv;
-       ModestHeaderViewColumn cols[] = {
-               MODEST_HEADER_VIEW_COLUMN_MSGTYPE,
-               MODEST_HEADER_VIEW_COLUMN_ATTACH,
-               MODEST_HEADER_VIEW_COLUMN_FROM,
-               MODEST_HEADER_VIEW_COLUMN_SUBJECT,
-               MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE
-       };
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        
-       for (i = 0 ; i != sizeof(cols) / sizeof(ModestHeaderViewColumn); ++i)
-               columns = g_list_append (columns, GINT_TO_POINTER(cols[i]));
-
        header_view = modest_widget_factory_get_header_view (priv->widget_factory);
-       modest_header_view_set_columns (header_view, columns);
        modest_header_view_set_style (header_view,
                                      MODEST_HEADER_VIEW_STYLE_SHOW_HEADERS);
-       g_list_free (columns);
        return header_view;
 }
 
@@ -213,7 +200,8 @@ restore_sizes (ModestMainWindow *self)
        ModestMainWindowPrivate *priv;
        
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-       conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
+       conf = modest_tny_platform_factory_get_conf_instance
+               (MODEST_TNY_PLATFORM_FACTORY(priv->factory));
 
        modest_widget_memory_restore (conf, G_OBJECT(priv->folder_paned),
                                      "modest-folder-paned");
@@ -235,7 +223,8 @@ save_sizes (ModestMainWindow *self)
        ModestConf *conf;
        
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-       conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
+       conf = modest_tny_platform_factory_get_conf_instance
+               (MODEST_TNY_PLATFORM_FACTORY(priv->factory));
        
        modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
        modest_widget_memory_save (conf, G_OBJECT(priv->folder_paned),
@@ -380,7 +369,7 @@ modest_main_window_new (ModestWidgetFactory *widget_factory,
        gtk_window_set_icon  (GTK_WINDOW(obj),
                              modest_icon_factory_get_icon (MODEST_APP_ICON));  
        gtk_widget_show_all (main_vbox);
-
+       
        g_signal_connect (G_OBJECT(obj), "delete-event",
                          G_CALLBACK(on_delete_event), obj);