Very first changes to embrace the new tinymail session code

[modest] / src / widgets / modest-folder-view.c

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 68eab73..25979ac 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -77,8 +77,8 @@ static void         on_account_removed     (TnyAccountStore *self,
                                            TnyAccount *account,
                                            gpointer user_data);
 
-static void         on_accounts_reloaded   (TnyAccountStore *store, 
-                                           gpointer user_data);
+/* static void         on_accounts_reloaded   (TnyAccountStore *store,  */
+/*                                         gpointer user_data); */
 
 static gint         cmp_rows               (GtkTreeModel *tree_model, 
                                            GtkTreeIter *iter1, 
@@ -151,7 +151,7 @@ struct _ModestFolderViewPrivate {
 
        gulong                account_update_signal;
        gulong                changed_signal;
-       gulong                accounts_reloaded_signal;
+/*     gulong                accounts_reloaded_signal; */
        gulong                account_removed_signal;
        gulong                conf_key_signal;
        
@@ -696,8 +696,8 @@ modest_folder_view_finalize (GObject *obj)
        if (priv->account_store) {
                g_signal_handler_disconnect (G_OBJECT(priv->account_store),
                                             priv->account_update_signal);
-               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-                                            priv->accounts_reloaded_signal);
+/*             g_signal_handler_disconnect (G_OBJECT(priv->account_store), */
+/*                                          priv->accounts_reloaded_signal); */
                g_signal_handler_disconnect (G_OBJECT(priv->account_store),
                                             priv->account_removed_signal);
                g_object_unref (G_OBJECT(priv->account_store));
@@ -761,10 +761,10 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore
                                                   priv->account_update_signal))
                        g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
                                                     priv->account_update_signal);
-               if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), 
-                                                  priv->accounts_reloaded_signal))
-                       g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
-                                                    priv->accounts_reloaded_signal);
+/*             if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),  */
+/*                                                priv->accounts_reloaded_signal)) */
+/*                     g_signal_handler_disconnect (G_OBJECT (priv->account_store),  */
+/*                                                  priv->accounts_reloaded_signal); */
                if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), 
                                                   priv->account_removed_signal))
                        g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
@@ -783,14 +783,14 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore
                g_signal_connect (G_OBJECT(account_store), "account_removed",
                                  G_CALLBACK (on_account_removed), self);
 
-       priv->accounts_reloaded_signal = 
-               g_signal_connect (G_OBJECT(account_store), "accounts_reloaded",
-                                 G_CALLBACK (on_accounts_reloaded), self);
+/*     priv->accounts_reloaded_signal =  */
+/*             g_signal_connect (G_OBJECT(account_store), "accounts_reloaded", */
+/*                               G_CALLBACK (on_accounts_reloaded), self); */
 
-       g_signal_connect (G_OBJECT(account_store), "connecting_finished",
-                               G_CALLBACK (on_accounts_reloaded), self);
+/*     g_signal_connect (G_OBJECT(account_store), "connecting_finished", */
+/*                             G_CALLBACK (on_accounts_reloaded), self); */
 
-       on_accounts_reloaded (account_store, (gpointer ) self);
+/*     on_accounts_reloaded (account_store, (gpointer ) self); */
        
        g_object_unref (G_OBJECT (device));
 }
@@ -846,13 +846,13 @@ on_account_update (TnyAccountStore *account_store,
                            account);
 }
 
-static void 
-on_accounts_reloaded   (TnyAccountStore *account_store, 
-                       gpointer user_data)
-{
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data));
-       modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store);
-}
+/* static void  */
+/* on_accounts_reloaded   (TnyAccountStore *account_store,  */
+/*                     gpointer user_data) */
+/* { */
+/*     g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data)); */
+/*     modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store); */
+/* } */
 
 void
 modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
@@ -1071,7 +1071,7 @@ modest_folder_view_update_model (ModestFolderView *self,
        /* FIXME: the local accounts are not shown when the query
           selects only the subscribed folders. */
 /*     model        = tny_gtk_folder_store_tree_model_new (TRUE, priv->query); */
-       model        = tny_gtk_folder_store_tree_model_new (TRUE, NULL);
+       model        = tny_gtk_folder_store_tree_model_new (NULL);
        
        /* Deal with the model via its TnyList Interface,
         * filling the TnyList via a get_accounts() call: */