* The toolbar buttons are expanded correctly in the viewer after clicking on Next...

[modest] / src / maemo / modest-msg-view-window.c

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index bb4fa54..2b15dab 100644 (file)
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -468,29 +468,23 @@ set_toolbar_mode (ModestMsgViewWindow *self,
 
        switch (mode) {
        case TOOLBAR_MODE_NORMAL:               
-/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); */
-/*             gtk_action_set_sensitive (widget, TRUE); */
-/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage"); */
-/*             gtk_action_set_sensitive (widget, TRUE); */
-/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo"); */
-/*             gtk_action_set_sensitive (widget, TRUE); */
-/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"); */
-/*             gtk_action_set_sensitive (widget, TRUE); */
-
-               if (priv->prev_toolitem)
-                       gtk_widget_show (priv->prev_toolitem);
-               
-               if (priv->next_toolitem)
-                       gtk_widget_show (priv->next_toolitem);
-                       
-               if (priv->progress_toolitem)
+               if (priv->progress_toolitem) {
                        gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE);
+                       gtk_widget_hide (priv->progress_toolitem);
+               }
+
                if (priv->progress_bar)
                        gtk_widget_hide (priv->progress_bar);
                        
                if (priv->cancel_toolitem)
                        gtk_widget_hide (priv->cancel_toolitem);
 
+               if (priv->prev_toolitem)
+                       gtk_widget_show (priv->prev_toolitem);
+               
+               if (priv->next_toolitem)
+                       gtk_widget_show (priv->next_toolitem);
+                       
                /* Hide toolbar if optimized view is enabled */
                if (priv->optimized_view) {
                        gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
@@ -499,15 +493,6 @@ set_toolbar_mode (ModestMsgViewWindow *self,
 
                break;
        case TOOLBAR_MODE_TRANSFER:
-/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); */
-/*             gtk_action_set_sensitive (widget, FALSE); */
-/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage"); */
-/*             gtk_action_set_sensitive (widget, FALSE); */
-/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo"); */
-/*             gtk_action_set_sensitive (widget, FALSE); */
-/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"); */
-/*             gtk_action_set_sensitive (widget, FALSE); */
-
                if (priv->prev_toolitem)
                        gtk_widget_hide (priv->prev_toolitem);