* ModestTnyFolderTreeView => ModestFolderView

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

diff --git a/src/gtk/modest-ui.c b/src/gtk/modest-ui.c
index 5052e51..53c302f 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,14 +163,14 @@ 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));
 }