X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=1345da80015f7fa564532bd4d95b08753df9f750;hb=807fde1cb71a8625f21a3f5241edf0c1f8e40378;hp=88a77452df3871b4b4556b1449897e6d619f32fc;hpb=b505270f03e14ae2b48378368775271af34831bb;p=modest

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 88a7745..1345da8 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1001,7 +1001,8 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
 			      error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE)) {
 			gchar *subject, *msg, *format = NULL;
 			TnyAccount *account;
-			subject = tny_header_dup_subject (header);
+			
+			subject = header?tny_header_dup_subject (header):NULL;
 			if (!subject)
 				subject = g_strdup (_("mail_va_no_subject"));
 
@@ -1045,6 +1046,7 @@ typedef struct {
 typedef struct {
 	GtkTreeModel *model;
 	TnyHeader *header;
+	ModestWindow *caller_window;
 	OpenMsgBannerInfo *banner_info;
 	GtkTreeRowReference *rowref;
 } OpenMsgHelper;
@@ -1349,10 +1351,22 @@ get_account_from_header (TnyHeader *header)
 }
 
 static void
+caller_win_destroyed (OpenMsgHelper *helper, GObject *object)
+{
+	if (helper->caller_window)
+		helper->caller_window = NULL;
+}
+
+static void
 open_msg_helper_destroyer (gpointer user_data)
 {
 	OpenMsgHelper *helper = (OpenMsgHelper *) user_data;
 
+	if (helper->caller_window) {
+		g_object_weak_unref ((GObject *) helper->caller_window, (GWeakNotify) caller_win_destroyed, helper);
+		helper->caller_window = NULL;
+	}
+
 	if (helper->banner_info) {
 		g_free (helper->banner_info->message);
 		if (helper->banner_info->idle_handler > 0) {
@@ -1392,7 +1406,7 @@ open_msg_performer(gboolean canceled,
 	helper = (OpenMsgHelper *) user_data;
 
 	status = tny_account_get_connection_status (account);
-	if (err || canceled) {
+	if (err || canceled || helper->caller_window == NULL) {
 		modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), helper->header);
 		/* Free the helper */
 		open_msg_helper_destroyer (helper);
@@ -1591,6 +1605,8 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
 	   (the user could switch between folders) */
 	helper = g_slice_new (OpenMsgHelper);
 	helper->model = g_object_ref (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)));
+	helper->caller_window = win;
+	g_object_weak_ref ((GObject *) helper->caller_window, (GWeakNotify) caller_win_destroyed, helper);
 	helper->header = g_object_ref (header);
 	helper->rowref = gtk_tree_row_reference_copy (rowref);
 	helper->banner_info = NULL;
@@ -2304,7 +2320,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
 		if (!acc_name)
 			acc_name  = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
 		if (!acc_name) {
-			g_printerr ("modest: cannot get default account\n");
+			modest_platform_information_banner (NULL, NULL, _("emev_ni_internal_error"));
 			return;
 		}
 	} else {
@@ -2314,6 +2330,12 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
 	acc_store = modest_runtime_get_account_store ();
 	account = modest_tny_account_store_get_server_account (acc_store, acc_name, TNY_ACCOUNT_TYPE_STORE);
 
+	if (!account) {
+		g_free (acc_name);
+		modest_platform_information_banner (NULL, NULL, _("emev_ni_internal_error"));
+		return;
+	}
+
 	/* Do not automatically refresh accounts that are flagged as
 	   NO_AUTO_UPDATE. This could be useful for accounts that
 	   handle their own update times */
@@ -5373,7 +5395,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 {
 	GObject *win = NULL;
 	const GError *error;
-	TnyAccount *account;
+	TnyAccount *account = NULL;
 
 #ifndef MODEST_TOOLKIT_HILDON2
 	ModestWindow *main_window = NULL;
@@ -5398,7 +5420,11 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 #endif
 	win = modest_mail_operation_get_source (mail_op);
 	error = modest_mail_operation_get_error (mail_op);
-	account = modest_mail_operation_get_account (mail_op);
+
+	if (TNY_IS_FOLDER (user_data))
+		account = modest_tny_folder_get_account (TNY_FOLDER (user_data));
+	else if (TNY_IS_ACCOUNT (user_data))
+		account = g_object_ref (user_data);
 
 	/* If it's not a disk full error then show a generic error */
 	if (!modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
@@ -5811,15 +5837,10 @@ on_move_folder_cb (gboolean canceled,
 
 	mail_op =
 		modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
-				modest_ui_actions_move_folder_error_handler,
-				info->src_folder, NULL);
+							       modest_ui_actions_move_folder_error_handler,
+							       g_object_ref (info->dst_folder), g_object_unref);
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-			mail_op);
-
-	/* Select *after* the changes */
-	/* TODO: this function hangs UI after transfer */
-	/* 			modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */
-	/* 							  TNY_FOLDER (src_folder), TRUE); */
+					 mail_op);
 
 	if (MODEST_IS_MAIN_WINDOW (parent_window)) {
 		modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),