* Fixes NB#87299, dimm Details option when focus is not neither on folder nor header...

pmo-trunk-r5249

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 86a6570..6fa1f68 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1451,10 +1451,18 @@ modest_main_window_set_style (ModestMainWindow *self,
        g_list_free (rows);
 
        /* Let header view grab the focus if it's being shown */
-       if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)
+       if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS) {
                gtk_widget_grab_focus (GTK_WIDGET (priv->header_view));
-       else 
-               gtk_widget_grab_focus (GTK_WIDGET (priv->contents_widget));
+       } else {
+               if (priv->style == MODEST_MAIN_WINDOW_STYLE_SPLIT)
+                       gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view));
+               else
+                       gtk_widget_grab_focus (GTK_WIDGET (priv->contents_widget));
+       }
+
+       /* Check dimming rules */
+        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
 
        /* Show changes */
        gtk_widget_show_all (GTK_WIDGET (priv->main_vbox));

diff --git a/src/modest-mail-operation.h b/src/modest-mail-operation.h
index 9017847..b45df3d 100644 (file)
--- a/src/modest-mail-operation.h
+++ b/src/modest-mail-operation.h
@@ -582,9 +582,7 @@ void          modest_mail_operation_xfer_msgs      (ModestMailOperation *self,
  * @remove_to_trash: TRUE to move it to trash or FALSE to delete it
  * permanently
  * 
- * Deletes a list of messages. This operation is synchronous, so the
- * #ModestMailOperation should not be added to any
- * #ModestMailOperationQueue
+ * Deletes a list of messages.
  **/
 void          modest_mail_operation_remove_msgs     (ModestMailOperation *self,
                                                     TnyList *headers,

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 280bb9e..0b3d233 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -851,8 +851,9 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data)
                                                modest_dimming_rule_set_notification (rule, "");
                                }
 
+                       } else {
+                               return TRUE;
                        }
-
                }
 
        /* msg view window dimming rules */