From: Javier Fernandez Garcia-Boente <jfernandez@igalia.com>
Date: Tue, 15 May 2007 11:22:24 +0000 (+0000)
Subject: * Dont use timeouts to change toolbar operation
X-Git-Tag: git_migration_finished~3602
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=17609754575b7f233100fa68bdf241d848a54b10;p=modest

* Dont use timeouts to change toolbar operation
mode.

pmo-trunk-r1871
---

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 6b8c350..8ff3cc9 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1407,9 +1407,7 @@ on_queue_changed (ModestMailOperationQueue *queue,
 	case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED:
 		if (mode == TOOLBAR_MODE_TRANSFER) {
 			if (mode_changed)
-				priv->progress_bar_timeout = g_timeout_add (2000, 
-									    (GSourceFunc) set_toolbar_transfer_mode, 
-									    self);		    
+				set_toolbar_transfer_mode(self);		    
 			while (tmp) {
 				modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data),
 								      mail_op);
@@ -1427,13 +1425,8 @@ on_queue_changed (ModestMailOperationQueue *queue,
 			
 			/* If no more operations are being observed, NORMAL mode is enabled again */
 			if (observers_empty (self)) {
-				if (priv->progress_bar_timeout > 0) {
-					g_source_remove (priv->progress_bar_timeout);
-					priv->progress_bar_timeout = 0;
-				}
-				else 
-					set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
-
+				set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
+				
 			}
 		}
 		break;
diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 4eb7754..8c148f9 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -1364,9 +1364,7 @@ on_queue_changed (ModestMailOperationQueue *queue,
 	case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED:
 		if (mode == TOOLBAR_MODE_TRANSFER) {
 			/* Enable transfer toolbar mode */
-			priv->progress_bar_timeout = g_timeout_add (2000, 
-								    (GSourceFunc) set_toolbar_transfer_mode, 
-								    self);
+			set_toolbar_transfer_mode(self);
 			while (tmp) {
 				modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data),
 								      mail_op);
@@ -1386,12 +1384,7 @@ on_queue_changed (ModestMailOperationQueue *queue,
 
 			/* If no more operations are being observed, NORMAL mode is enabled again */
 			if (observers_empty (self)) {
-				if (priv->progress_bar_timeout > 0) {
-					g_source_remove (priv->progress_bar_timeout);
-					priv->progress_bar_timeout = 0;
-				}
-				else 
-					set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
+				set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
 			}
 		}
 		break;