* Updated files to fit the last Modest APIs

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

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 7dfc7e7..48a7e23 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -64,17 +64,17 @@ typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate;
 struct _ModestMainWindowPrivate {
 
        GtkUIManager *ui_manager;
+       ModestWidgetFactory *widget_factory;
+       TnyPlatformFactory *factory;
+       ModestTnyAccountStore *account_store;
 
        GtkWidget *toolbar;
        GtkWidget *msg_paned;
        GtkWidget *main_paned;
        
-       ModestWidgetFactory *widget_factory;
-       TnyPlatformFactory *factory;
-       
        ModestHeaderView *header_view;
        ModestFolderView *folder_view;
-       //ModestMsgView    *msg_preview;
+       ModestMsgView    *msg_preview;
 };
 
 
@@ -148,6 +148,9 @@ modest_main_window_init (ModestMainWindow *obj)
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
        
        priv->factory = modest_tny_platform_factory_get_instance ();
+       priv->widget_factory = NULL;
+       priv->ui_manager = NULL;
+       priv->account_store = NULL;
 }
 
 static void
@@ -159,7 +162,15 @@ modest_main_window_finalize (GObject *obj)
                g_object_unref (G_OBJECT(priv->widget_factory));
                priv->widget_factory = NULL;
        }
-
+       if (priv->ui_manager) {
+               g_object_unref (G_OBJECT(priv->ui_manager));
+               priv->ui_manager = NULL;
+       }
+       if (priv->account_store) {
+               g_object_unref (G_OBJECT(priv->account_store));
+               priv->account_store = NULL;
+       }
+       
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -258,6 +269,7 @@ modest_main_window_new (ModestWidgetFactory *widget_factory,
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
 
        priv->widget_factory = g_object_ref (widget_factory);
+       priv->account_store = g_object_ref (account_store);
        //priv->ui_manager = g_object_ref (ui_manager);
 
        /* Add accelerators */
@@ -321,5 +333,30 @@ modest_main_window_new (ModestWidgetFactory *widget_factory,
        g_signal_connect (G_OBJECT(obj), "delete-event",
                          G_CALLBACK(on_delete_event), obj);
        
-       return GTK_WIDGET(obj);
+       return (ModestWindow *) obj;
+}
+
+ModestWidgetFactory *
+modest_main_window_get_widget_factory (ModestMainWindow *main_window)
+{
+       ModestMainWindowPrivate *priv;
+                       
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), NULL);
+
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
+
+       return g_object_ref (priv->widget_factory);
+}
+       
+TnyAccountStore * 
+modest_main_window_get_account_store (ModestMainWindow *main_window)
+{
+       ModestMainWindowPrivate *priv;
+                       
+
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), NULL);
+
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
+
+       return g_object_ref (priv->account_store);
 }