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 4531218..0809147 100644 (file)
--- a/src/widgets/modest-header-window.c
+++ b/src/widgets/modest-header-window.c
@@ -278,7 +278,7 @@ modest_header_window_dispose (GObject *obj)
 
        folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view);
        if (folder) {
-               tny_folder_sync_async (folder, FALSE, NULL, NULL, NULL);
+               tny_folder_sync_async (folder, TRUE, NULL, NULL, NULL);
                g_object_unref (folder);
        }
 
@@ -433,6 +433,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
        update_view (MODEST_HEADER_WINDOW (user_data), NULL);
 }
 
+#ifdef MAEMO_CHANGES
 static gboolean
 tap_and_hold_query_cb (GtkWidget *header_view,
                       GdkEvent *event,
@@ -478,6 +479,7 @@ tap_and_hold_query_cb (GtkWidget *header_view,
 
        return FALSE;
 }
+#endif
 
 static void
 delete_header (GtkWindow *parent,
@@ -648,8 +650,10 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
        gtk_widget_show_all (priv->csm_menu);
 
        /* Connect signals */
+#ifdef MAEMO_CHANGES
        g_signal_connect ((GObject *) header_view, "tap-and-hold-query",
                          G_CALLBACK (tap_and_hold_query_cb), self);
+#endif
        g_signal_connect ((GObject *) delete_item, "activate",
                          G_CALLBACK (on_delete_csm_activated), self);
        g_signal_connect ((GObject *) mark_read_item, "activate",
@@ -922,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),
@@ -1078,7 +1094,7 @@ show_updating_banner (gpointer user_data)
                gdk_threads_enter ();
                priv->updating_banner = 
                        modest_platform_animation_banner (GTK_WIDGET (user_data), NULL,
-                                                         _CS ("ckdg_pb_updating"));
+                                                         _CS_UPDATING);
 
                /* We need this because banners in Maemo could be
                   destroyed by dialogs so we need to properly update
@@ -1152,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