From: Felipe Erias Morandeira <femorandeira@igalia.com>
Date: Mon, 19 Nov 2007 16:52:12 +0000 (+0000)
Subject: Fixes NB#76174
X-Git-Tag: git_migration_finished~2063
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=594387ddd061af8176bcdf5b1710702725e621fa

Fixes NB#76174

pmo-trunk-r3768
---

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 76891c7..65b175d 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1431,7 +1431,10 @@ modest_main_window_show_toolbar (ModestWindow *self,
 		gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
 
 		gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
-		set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
+		if (modest_main_window_transfer_mode_enabled (MODEST_MAIN_WINDOW(self)))
+			set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_TRANSFER);
+		else
+			set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
 	} else {
 		gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
 
diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index eea919d..f293325 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -2009,10 +2009,13 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
 		/* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */ 
 		/* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */
 		gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
-		
+
 		gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
-		set_toolbar_mode (MODEST_MSG_VIEW_WINDOW(self), TOOLBAR_MODE_NORMAL);			
-		
+		if (modest_msg_view_window_transfer_mode_enabled (MODEST_MSG_VIEW_WINDOW (self))) 
+			set_toolbar_mode (MODEST_MSG_VIEW_WINDOW (self), TOOLBAR_MODE_TRANSFER);
+		else
+			set_toolbar_mode (MODEST_MSG_VIEW_WINDOW (self), TOOLBAR_MODE_NORMAL);
+
 	} else {
 		gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
 		gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));