* compile fixes

[modest] / src / gtk / modest-ui.c

diff --git a/src/gtk/modest-ui.c b/src/gtk/modest-ui.c
index d7dd880..47dd0d7 100644 (file)
--- a/src/gtk/modest-ui.c
+++ b/src/gtk/modest-ui.c
@@ -47,9 +47,9 @@
 #include "../modest-identity-mgr.h"
 
 #include "../modest-tny-account-store.h"
-#include "../modest-tny-folder-tree-view.h"
-#include "../modest-tny-header-tree-view.h"
-#include "../modest-tny-msg-view.h"
+#include "../widgets/modest-folder-view.h"
+#include "../widgets/modest-header-view.h"
+#include "../widgets/modest-msg-view.h"
 #include "../modest-tny-transport-actions.h"
 #include "../modest-tny-store-actions.h"
 
@@ -65,8 +65,6 @@
 static void   modest_ui_class_init     (ModestUIClass *klass);
 static void   modest_ui_init           (ModestUI *obj);
 static void   modest_ui_finalize       (GObject *obj);
-
-static void   modest_ui_window_destroy    (GtkWidget *win, GdkEvent *event, gpointer data);
 static void   modest_ui_last_window_closed (GObject *obj, gpointer data);
 
 gchar *on_password_requested (TnyAccountIface *, const gchar *, gboolean *);
@@ -165,18 +163,18 @@ on_accounts_reloaded (ModestTnyAccountStore *account_store, gpointer user_data)
 {
        ModestUIPrivate *priv = user_data;
 
-       g_return_if_fail (MODEST_IS_TNY_FOLDER_TREE_VIEW (priv->folder_view));
-       g_return_if_fail (MODEST_IS_TNY_HEADER_TREE_VIEW (priv->header_view));
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (priv->folder_view));
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (priv->header_view));
 
-       modest_tny_header_tree_view_set_folder (MODEST_TNY_HEADER_TREE_VIEW(priv->header_view),
+       modest_header_view_set_folder (MODEST_HEADER_VIEW(priv->header_view),
                                                NULL);
 
-       modest_tny_folder_tree_view_update_model(MODEST_TNY_FOLDER_TREE_VIEW(priv->folder_view),
-                                                TNY_ACCOUNT_STORE_IFACE(account_store));
+       //      modest_folder_view_update_model(MODEST_FOLDER_VIEW(priv->folder_view),
+       //                      TNY_ACCOUNT_STORE_IFACE(account_store));
 }
 
 
-GObject*
+ModestUI*
 modest_ui_new (ModestConf *modest_conf)
 {
        GObject *obj;
@@ -213,8 +211,8 @@ modest_ui_new (ModestConf *modest_conf)
                return NULL;
         }
 
-        modest_tny_account_store_set_get_pass_func(MODEST_TNY_ACCOUNT_STORE(account_store_iface),
-                                                   on_password_requested);
+        //modest_tny_account_store_set_get_pass_func(MODEST_TNY_ACCOUNT_STORE(account_store_iface),
+        //                                           on_password_requested);
 
        g_signal_connect (account_store_iface, "accounts_reloaded",
                          G_CALLBACK(on_accounts_reloaded), priv);
@@ -243,8 +241,8 @@ modest_ui_new (ModestConf *modest_conf)
                          NULL);
 
        account_names_list = modest_account_mgr_search_server_accounts(modest_acc_mgr,
-                                                                      
-                                                                      NULL, MODEST_PROTO_TYPE_ANY, NULL, FALSE);
+                                                                      NULL, MODEST_PROTO_TYPE_ANY,
+                                                                      NULL);
        identities_list = modest_identity_mgr_identity_names(modest_id_mgr, NULL);
        if (!(account_names_list != NULL || identities_list != NULL))
                wizard_account_dialog(MODEST_UI(obj));
@@ -264,7 +262,7 @@ modest_ui_new (ModestConf *modest_conf)
        }
        g_slist_free(identities_list);
 
-       return obj;
+       return MODEST_UI(obj);
 }