X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=71fa5dd780e3516efe440b87b5285be86c932e68;hb=a880bf6b76fa7c205967b253943025c31f93555a;hp=74367e65e9d28bc62f6ae095554f6bda3d4143f6;hpb=cdfa49be23f8f02e602b4780bd0e1dd485624b86;p=modest

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 74367e6..71fa5dd 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1193,14 +1193,34 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user
 static gboolean
 _forbid_outgoing_xfers (ModestWindow *window)
 {
-	const gchar *account_name;
-	TnyAccount *account;
+	const gchar *account_name = NULL;
+	TnyAccount *account = NULL;
 	gboolean dimmed = FALSE;
 
-	account_name = modest_window_get_active_account (window);
-	account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
-							       account_name,
-							       TNY_ACCOUNT_TYPE_STORE);
+#ifdef MODEST_TOOLKIT_HILDON2
+	/* We cannot just get the active account because the active
+	   account of a header window that shows the headers of a
+	   local account is the ID of the remote account */
+	if (MODEST_IS_HEADER_WINDOW (window)) {
+		ModestHeaderView *header_view;
+		TnyFolder *folder;
+
+		header_view = modest_header_window_get_header_view ((ModestHeaderWindow *) window);
+		folder = modest_header_view_get_folder (header_view);
+
+		if (folder) {
+			account = modest_tny_folder_get_account (folder);
+			g_object_unref (folder);
+		}
+	}
+#endif
+
+	if (!account) {
+		account_name = modest_window_get_active_account (window);
+		account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
+								       account_name,
+								       TNY_ACCOUNT_TYPE_STORE);
+	}
 
 	if (account) {
 		ModestProtocolType protocol_type;
@@ -2073,7 +2093,7 @@ modest_ui_dimming_rules_on_send_receive_all (ModestWindow *win, gpointer user_da
 gboolean
 modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_data)
 {
-	GSList *recipients;
+	GSList *recipients = NULL;
 	gboolean has_recipients_to_add;
 
  	g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);