X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=32af30d211c92d2ef48a801df0672f24de7fff1a;hp=8ba9fe95f7ff2cc1def4c7da55cd94d4c7506a54;hb=06ee0f33a632215fe2948f2113e2e425151a5e2e;hpb=c4adce3e18a59f68e79bd970b79a64b2069de574

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 8ba9fe9..32af30d 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1704,7 +1704,8 @@ do_send_receive_performer (gboolean canceled,
 
 	/* Send & receive. */
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-	modest_mail_operation_update_account (mail_op, info->account_name, new_messages_arrived, info->win);
+	modest_mail_operation_update_account (mail_op, info->account_name, (info->win) ? FALSE : TRUE,
+					      new_messages_arrived, info->win);
 	g_object_unref (G_OBJECT (mail_op));
 	
  clean:
@@ -2197,7 +2198,6 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op,
 		      gpointer user_data)
 {
 	ModestMsgEditWindow *edit_window;
-	char *info_text;
 	ModestMainWindow *win;
 
 	/* FIXME. Make the header view sensitive again. This is a
@@ -2218,9 +2218,6 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op,
 		return;
 
 	modest_msg_edit_window_set_draft (edit_window, saved_draft);
-	info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
-	modest_platform_information_banner (NULL, NULL, info_text);
-	g_free (info_text);
 }
 
 void
@@ -2231,6 +2228,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 	MsgData *data;
 	gchar *account_name, *from;
 	ModestAccountMgr *account_mgr;
+	char *info_text;
 
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
 	
@@ -2284,7 +2282,11 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 					      data->priority_flags,
 					      on_save_to_drafts_cb,
 					      edit_window);
+	info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
+	modest_platform_information_banner (NULL, NULL, info_text);
+
 	/* Frees */
+	g_free (info_text);
 	g_free (from);
 	g_free (account_name);
 	g_object_unref (G_OBJECT (transport_account));
@@ -2398,6 +2400,10 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 					     data->attachments,
 					     data->images,
 					     data->priority_flags);
+
+	if (modest_mail_operation_get_status (mail_operation) == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
+		modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent"));
+
 					     
 	/* Free data: */
 	g_free (from);