two small modification

[modest] / src / maemo / modest-main-window.c

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 224d719..283cdce 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1364,24 +1364,6 @@ modest_main_window_set_style (ModestMainWindow *self,
                /* Reparent the contents widget to the main vbox */
                gtk_widget_reparent (priv->contents_widget, priv->main_vbox);
 
-               if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) {
-                       TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view));
-                       TnyIterator *iterator = tny_list_create_iterator (selection);
-                       TnyHeader *header;
-                       tny_iterator_first (iterator);
-                       header = TNY_HEADER (tny_iterator_get_current (iterator));
-                       if (tny_header_get_subject (header))
-                               gtk_window_set_title (GTK_WINDOW(self), tny_header_get_subject (header));
-                       else
-                               gtk_window_set_title (GTK_WINDOW (self), _("mail_va_no_subject"));
-                       
-                       if (header)
-                               g_object_unref (header);
-
-                       g_object_unref (iterator);
-                       g_object_unref (selection);
-               }
-
                break;
        case MODEST_MAIN_WINDOW_STYLE_SPLIT:
                /* Remove header view */
@@ -2038,6 +2020,9 @@ set_toolbar_mode (ModestMainWindow *self,
        /* Sets current toolbar mode */
        priv->current_toolbar_mode = mode;
 
+        /* Checks the dimming rules */
+        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+
        /* Show and hide toolbar items */
        switch (mode) {
        case TOOLBAR_MODE_NORMAL:
@@ -2082,6 +2067,17 @@ set_toolbar_mode (ModestMainWindow *self,
        }
 }
 
+gboolean
+modest_main_window_transfer_mode_enabled (ModestMainWindow *self)
+{
+       ModestMainWindowPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), FALSE);
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+       return priv->current_toolbar_mode == TOOLBAR_MODE_TRANSFER;
+}
+
 static void
 cancel_progressbar (GtkToolButton *toolbutton,
                    ModestMainWindow *self)
@@ -2311,27 +2307,6 @@ on_header_view_focus_in (GtkWidget *widget,
        main_window = MODEST_MAIN_WINDOW (userdata);
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
 
-       if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) {
-               TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view));
-               TnyIterator *iterator = tny_list_create_iterator (selection);
-               TnyHeader *header;
-
-               tny_iterator_first (iterator);
-               header = TNY_HEADER (tny_iterator_get_current (iterator));
-               
-               if (tny_header_get_subject (header))
-                       gtk_window_set_title (GTK_WINDOW(main_window), tny_header_get_subject (header));
-               else
-                       gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
-
-               if (header)
-                       g_object_unref (header);
-
-               g_object_unref (iterator);
-               g_object_unref (selection);
-       }
-
-
        /* Update toolbar dimming state */
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));