From: Jose Dapena Paz <jdapena@igalia.com>
Date: Fri, 9 Nov 2007 12:06:26 +0000 (+0000)
Subject: * src/modest-ui-dimming-rules.c:
X-Git-Tag: git_migration_finished~2134
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=87d15f85cce1e74d7357de845f5aa1fbab57ce09

* src/modest-ui-dimming-rules.c:
	* Make on_cancel_sending check same dimming rule of
	  on_csm_cancel_sending. Fixes NB#75510.

pmo-trunk-r3682
---

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index cac4d9c..7f109f8 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -67,7 +67,6 @@ static gboolean _msg_download_in_progress (ModestWindow *win);
 static gboolean _msg_download_completed (ModestMainWindow *win);
 static gboolean _selected_msg_sent_in_progress (ModestWindow *win);
 static gboolean _sending_in_progress (ModestWindow *win);
-static gboolean _send_receive_in_progress (ModestWindow *win);
 static gboolean _invalid_folder_for_purge (ModestWindow *win, ModestDimmingRule *rule);
 static gboolean _transfer_mode_enabled (ModestWindow *win);
 static gboolean _selected_folder_has_subfolder_with_same_name (ModestWindow *win);
@@ -1696,7 +1695,7 @@ modest_ui_dimming_rules_on_csm_cancel_sending (ModestWindow *win, gpointer user_
 			modest_dimming_rule_set_notification (rule, "");
  	}
 	if (!dimmed) {
-		dimmed = !_send_receive_in_progress (win);
+		dimmed = !_sending_in_progress (win);
  		if (dimmed)
 			modest_dimming_rule_set_notification (rule, "");
 	}
@@ -2474,19 +2473,6 @@ _sending_in_progress (ModestWindow *win)
 }
 
 static gboolean
-_send_receive_in_progress (ModestWindow *win)
-{
-	gboolean result = FALSE;
-	
-	g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (win), FALSE);
-
-	/* Check if send operation is in progress */
-	result = modest_main_window_send_receive_in_progress (MODEST_MAIN_WINDOW (win));
-
-	return result;
-}
-
-static gboolean
 _invalid_folder_for_purge (ModestWindow *win, 
 			   ModestDimmingRule *rule)
 {