* update for the changes in the APIs, as well as for *some* compile

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

diff --git a/src/hildon/modest-ui.c b/src/hildon/modest-ui.c
index 78b91db..9999a1d 100644 (file)
--- a/src/hildon/modest-ui.c
+++ b/src/hildon/modest-ui.c
@@ -27,9 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
-/* modest-ui.c */
-
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
@@ -69,7 +66,7 @@ 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_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 *);
@@ -172,9 +169,11 @@ on_accounts_reloaded (ModestTnyAccountStore *account_store, gpointer 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));
 
-       modest_tny_header_tree_view_set_folder (priv->header_view, NULL);
+       modest_tny_header_tree_view_set_folder (MODEST_TNY_HEADER_TREE_VIEW(priv->header_view),
+                                               NULL);
 
-       modest_tny_folder_tree_view_update_model(priv->folder_view, account_store);
+       modest_tny_folder_tree_view_update_model(MODEST_TNY_FOLDER_TREE_VIEW(priv->folder_view),
+                                                TNY_ACCOUNT_STORE(account_store));
 }
 
 
@@ -244,8 +243,8 @@ modest_ui_new (ModestConf *modest_conf)
                          G_CALLBACK(modest_ui_last_window_closed),
                          NULL);
 
-       account_names_list = modest_account_mgr_server_account_names(modest_acc_mgr,
-                                       NULL, MODEST_PROTO_TYPE_ANY, NULL, FALSE);
+       account_names_list = modest_account_mgr_search_server_accounts (modest_acc_mgr,
+                                                                       NULL, MODEST_PROTO_TYPE_ANY, NULL, FALSE);
        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));