* small stuff

pmo-trunk-r881

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 9e1cec7..2984cdd 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -204,8 +204,6 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
        
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
-
-       g_message ("modest: send mail");
        
        send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
        if (!TNY_IS_SEND_QUEUE(send_queue))
@@ -534,11 +532,16 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 
        /* Get subscribed folders & refresh them */
        folders = TNY_LIST (tny_simple_list_new ());
-       query = tny_folder_store_query_new ();
-       tny_folder_store_query_add_item (query, NULL, TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
+       query = NULL; //tny_folder_store_query_new ();
+
+       /* FIXME: is this needed? */
+       tny_device_force_online (TNY_DEVICE(modest_runtime_get_device()));
+       
+       /* FIXME: let query be NULL: do it for all */ 
+       //tny_folder_store_query_add_item (query, NULL, TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
        tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account),
                                            folders, update_folders_cb, query, self);
-       g_object_unref (query); /* FIXME */
+       //g_object_unref (query); /* FIXME */
        
        return TRUE;
 }

diff --git a/src/modest-runtime.c b/src/modest-runtime.c
index 22aa14b..3803074 100644 (file)
--- a/src/modest-runtime.c
+++ b/src/modest-runtime.c
@@ -648,7 +648,7 @@ init_default_settings (ModestConf *conf)
 {
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR, TRUE, NULL);
-
+       
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL);
 

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 550e2ba..1f23d3f 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -506,7 +506,7 @@ modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
 {
        gchar *account_name;
        TnyAccount *tny_account;
-       //ModestTnySendQueue *send_queue;
+       ModestTnySendQueue *send_queue;
        ModestMailOperation *mail_op;
        
        account_name =
@@ -517,8 +517,7 @@ modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
                g_printerr ("modest: cannot get account\n");
                return;
        }
-       /* FIXME */
-#if 0
+
        tny_account = 
                modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
                                                                     account_name,
@@ -527,18 +526,17 @@ modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
                g_printerr ("modest: cannot get tny transport account for %s\n", account_name);
                return;
        }
-
        send_queue = modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(tny_account));
        if (!send_queue) {
                g_object_unref (G_OBJECT(tny_account));
                g_printerr ("modest: cannot get send queue for %s\n", account_name);
                return;
        } 
-       modest_tny_send_queue_flush (send_queue);
+       //modest_tny_send_queue_flush (send_queue);
 
        g_object_unref (G_OBJECT(send_queue));
        g_object_unref (G_OBJECT(tny_account));
-#endif /*  0 */
+
        tny_account = 
                modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
                                                                     account_name,