X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=a1bea67571a1f88b2a36bb8a14a07e6267a82fc0;hb=93d9f98dd236270a7b6047739ab5d5cd8eb06a32;hp=8076dd9f04cc8ad46a7e72ff655a5181c72c2624;hpb=bd4de972656d134acae12fb14817df1f8ae44589;p=modest

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 8076dd9..a1bea67 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -805,7 +805,8 @@ modest_ui_actions_compose_msg(ModestWindow *win,
 		goto cleanup;
 
 #ifdef MODEST_TOOLKIT_HILDON2
-	account_name = g_strdup (modest_window_get_active_account(win));
+	if (win)
+		account_name = g_strdup (modest_window_get_active_account(win));
 #endif
 	if (!account_name) {
 		account_name = modest_account_mgr_get_default_account(mgr);
@@ -815,7 +816,10 @@ modest_ui_actions_compose_msg(ModestWindow *win,
 		goto cleanup;
 	}
 
-	mailbox = modest_window_get_active_mailbox (win);
+	if (win)
+		mailbox = modest_window_get_active_mailbox (win);
+	else
+		mailbox = NULL;
 	account = modest_tny_account_store_get_server_account (store, account_name, TNY_ACCOUNT_TYPE_STORE);
 	if (!account) {
 		g_printerr ("modest: failed to get tnyaccount for '%s'\n", account_name);
@@ -2574,7 +2578,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
 		     gpointer user_data)
 {
 	ModestMainWindow *win = NULL;
-	GtkWidget *folder_view;
+	GtkWidget *folder_view, *header_view;
 	const GError *error;
 
 	g_return_if_fail (TNY_IS_FOLDER (folder));
@@ -2593,6 +2597,8 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
 
 	folder_view =
 		modest_main_window_get_child_widget(win, MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+	header_view =
+		modest_main_window_get_child_widget(win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
 
 	if (folder_view) {
 		TnyFolderStore *current_folder;
@@ -2607,10 +2613,10 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
 	}
 
 	/* Check if folder is empty and set headers view contents style */
-	if (tny_folder_get_all_count (folder) == 0)
+	if ((tny_folder_get_all_count (folder) == 0) ||
+	    modest_header_view_is_empty (MODEST_HEADER_VIEW (header_view)))
 		modest_main_window_set_contents_style (win,
 						       MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
-
 }
 
 void
@@ -3460,8 +3466,10 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
 	if (!error)
 		g_return_if_reached ();
 
-	if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
-	    error->code == MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS) {
+	if (is_memory_full_error ((GError *) error, mail_op)) {
+		message = _KR("cerm_device_memory_full");
+	} else if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
+		   error->code == MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS) {
 		message = _CS("ckdg_ib_folder_already_exists");
 	} else if (error->domain == TNY_ERROR_DOMAIN &&
 		   error->code == TNY_SERVICE_ERROR_STATE) {
@@ -4584,7 +4592,18 @@ headers_action_show_details (TnyHeader *header,
 			     gpointer user_data)
 
 {
-	modest_platform_run_header_details_dialog (GTK_WINDOW (window), header);
+	gboolean async_retrieval;
+	TnyMsg *msg = NULL;
+
+	if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+		async_retrieval = TRUE;
+		msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (window));
+	} else {
+		async_retrieval = FALSE;
+	}
+	modest_platform_run_header_details_dialog (GTK_WINDOW (window), header, async_retrieval, msg);
+	if (msg)
+		g_object_unref (msg);
 }
 
 /*
@@ -5045,7 +5064,9 @@ create_move_to_dialog (GtkWindow *win,
 	g_object_set_data (G_OBJECT(dialog), MODEST_MOVE_TO_DIALOG_FOLDER_VIEW, tree_view);
 
 	/* Hide special folders */
+#ifndef MODEST_TOOLKIT_HILDON2
 	modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (tree_view), FALSE);
+#endif
 	if (list_to_move)
 		modest_folder_view_set_list_to_move (MODEST_FOLDER_VIEW (tree_view), list_to_move);
 #ifndef MODEST_TOOLKIT_HILDON2