From: Sergio Villar Senin <svillar@igalia.com>
Date: Fri, 24 Oct 2008 08:13:32 +0000 (+0000)
Subject: 	* Reverts an invalid change in the previous commit
X-Git-Tag: git_migration_finished~1102
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=4e84a952255aca3593918eedddae60340471063a

	* Reverts an invalid change in the previous commit
	* Fixes an invalid g_object_unref

pmo-trunk-r6157
---

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 295db86..42b39a6 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -853,7 +853,6 @@ modest_platform_run_confirmation_dialog_with_buttons (GtkWindow *parent_window,
 							   button_accept, GTK_RESPONSE_ACCEPT,
 							   button_cancel, GTK_RESPONSE_CANCEL,
 							   NULL);
-	gtk_widget_set_no_show_all (button_cancel, FALSE);
 
 	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
 				     GTK_WINDOW (dialog), parent_window);
diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index f9738a5..a377d61 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -4536,7 +4536,10 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
 											 MODEST_PROTOCOL_REGISTRY_STORE_HAS_FOLDERS));
 		}
 		g_object_unref (local_account);
-		g_object_unref (mmc_account);
+
+		/* It could not exist */
+		if (mmc_account)
+			g_object_unref (mmc_account);
 	}
 
 	/* Check the target folder rules */