* src/maemo/modest-main-window.c:

[modest] / src / modest-ui-actions.c

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index f5455dc..669fb18 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -769,7 +769,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 
        if (win)
                gtk_window_set_transient_for (GTK_WINDOW (msg_win),
-                                             GTK_WINDOW (win));        
+                                             GTK_WINDOW (win));
        gtk_widget_show_all (GTK_WIDGET (msg_win));
 
 cleanup:
@@ -849,7 +849,11 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header,  TnyMsg *msg, gpoi
                                goto cleanup;
                }
                win = modest_msg_edit_window_new (msg, account, TRUE);
-               
+
+
+               /* Show banner */
+               modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message"));
+
        } else {
                gchar *uid = modest_tny_folder_get_header_unique_id (header);
                
@@ -1823,7 +1827,6 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
 {
        ModestMainWindow *win = NULL;
        GtkWidget *header_view;
-       TnyFolder *current_folder;
        gboolean folder_empty = FALSE;
        gboolean all_marked_as_deleted = FALSE;
 
@@ -1834,10 +1837,14 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
                modest_main_window_get_child_widget(win, MODEST_WIDGET_TYPE_HEADER_VIEW);
 
        if (header_view) {
+               TnyFolder *current_folder;
+
                current_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
                if (current_folder != NULL && folder != current_folder) {
+                       g_object_unref (current_folder);
                        return;
                }
+               g_object_unref (current_folder);
        }
 
        /* Check if folder is empty and set headers view contents style */
@@ -3199,9 +3206,10 @@ modest_ui_actions_on_change_zoom (GtkRadioAction *action,
        }
 }
 
-void     modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
-                                                       GtkRadioAction *selected,
-                                                       ModestWindow *window)
+void     
+modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
+                                              GtkRadioAction *selected,
+                                              ModestWindow *window)
 {
        TnyHeaderFlags flags;
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
@@ -3210,9 +3218,10 @@ void     modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
        modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW (window), flags);
 }
 
-void     modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action,
-                                                          GtkRadioAction *selected,
-                                                          ModestWindow *window)
+void     
+modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action,
+                                                 GtkRadioAction *selected,
+                                                 ModestWindow *window)
 {
        gint file_format;
 
@@ -3431,7 +3440,7 @@ modest_ui_actions_on_toggle_toolbar (GtkToggleAction *toggle,
 
        /* Toggle toolbar */
        mgr = modest_runtime_get_window_mgr ();
-       modest_window_mgr_show_toolbars (mgr, active, fullscreen);
+       modest_window_mgr_show_toolbars (mgr, G_TYPE_FROM_INSTANCE (window), active, fullscreen);
 }
 
 void