Crash when closing viewer window while downloading external images

[modest] / src / widgets / modest-header-window.c

diff --git a/src/widgets/modest-header-window.c b/src/widgets/modest-header-window.c
index b51fd38..0809147 100644 (file)
--- a/src/widgets/modest-header-window.c
+++ b/src/widgets/modest-header-window.c
@@ -926,6 +926,18 @@ static void setup_menu (ModestHeaderWindow *self)
        modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_messages"), NULL,
                                   MODEST_WINDOW_MENU_CALLBACK (set_delete_edit_mode),
                                   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
+#else
+       modest_window_add_to_menu (MODEST_WINDOW (self),
+                                  dngettext(GETTEXT_PACKAGE,
+                                            "mcen_me_move_message",
+                                            "mcen_me_move_messages",
+                                            2),
+                                  NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_move_to),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_messages"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_delete_message),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
 #endif
        modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_folder_details"), NULL,
                                   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_details),
@@ -1156,11 +1168,12 @@ on_expose_event(GtkTreeView *header_view,
                gpointer user_data)
 {
        ModestHeaderWindow *self = (ModestHeaderWindow *) user_data;
-       ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
 
        g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
 
 #ifdef MODEST_TOOLKIT_HILDON2
+       ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
        if (priv->autoscroll)
                modest_scrollable_jump_to (MODEST_SCROLLABLE (priv->contents_view), 0.0, 0.0);
 #endif