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 9dcd552..0809147 100644 (file)
--- a/src/widgets/modest-header-window.c
+++ b/src/widgets/modest-header-window.c
@@ -176,9 +176,11 @@ static void on_progress_list_changed (ModestWindowMgr *mgr,
 static void update_progress_hint (ModestHeaderWindow *self);
 static void on_header_view_model_destroyed (gpointer user_data,
                                            GObject *model);
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean on_key_press(GtkWidget *widget,
                                        GdkEventKey *event,
                                        gpointer user_data);
+#endif
 
 /* globals */
 static GtkWindowClass *parent_class = NULL;
@@ -213,7 +215,7 @@ modest_header_window_get_type (void)
 #ifdef MODEST_TOOLKIT_HILDON2
                                                  MODEST_TYPE_HILDON2_WINDOW,
 #else
-                                                 MODEST_TYPE_WINDOW,
+                                                 MODEST_TYPE_SHELL_WINDOW,
 #endif
                                                  "ModestHeaderWindow",
                                                  &my_info, 0);
@@ -264,9 +266,6 @@ modest_header_window_init (ModestHeaderWindow *obj)
        priv->y_coord = 0;
        priv->notify_model = 0;
 
-       modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
-                                           GTK_WINDOW(obj),
-                                           "applications_email_headerview");
 }
 
 static void
@@ -279,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);
        }
 
@@ -396,13 +395,14 @@ connect_signals (ModestHeaderWindow *self)
                                                       G_OBJECT (modest_runtime_get_window_mgr ()),
                                                       "progress-list-changed",
                                                       G_CALLBACK (on_progress_list_changed), self);
+
+#ifdef MODEST_TOOLKIT_HILDON2
        priv->sighandlers =
                modest_signal_mgr_connect (priv->sighandlers,
                                           G_OBJECT (priv->new_message_button),
                                           "clicked",
                                           G_CALLBACK (modest_ui_actions_on_new_msg), self);
 
-#ifdef MODEST_TOOLKIT_HILDON2
        /* Delete using horizontal gesture */
        /* DISABLED because it's unreliabile */
        if (HILDON_IS_PANNABLE_AREA (priv->contents_view)) {
@@ -418,8 +418,10 @@ connect_signals (ModestHeaderWindow *self)
 #endif
 
 
+#ifdef MODEST_TOOLKIT_HILDON2
        g_signal_connect(G_OBJECT(self), "key-press-event",
                        G_CALLBACK(on_key_press), self);
+#endif
 }
 
 static void
@@ -431,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,
@@ -476,6 +479,7 @@ tap_and_hold_query_cb (GtkWidget *header_view,
 
        return FALSE;
 }
+#endif
 
 static void
 delete_header (GtkWindow *parent,
@@ -632,7 +636,7 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
 
        /* Create CSM menu */
        priv->csm_menu = gtk_menu_new ();
-       delete_item = gtk_menu_item_new_with_label (_HL("wdgt_bd_delete"));
+       delete_item = gtk_menu_item_new_with_label (_HL_DELETE);
        mark_read_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_read"));
        mark_unread_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_unread"));
        gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), delete_item);
@@ -646,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",
@@ -831,12 +837,12 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc
        /* setup edit modes */
 #ifdef MODEST_TOOLKIT_HILDON2
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE,
-                                                 _("mcen_ti_edit_delete"), _HL("wdgt_bd_delete"),
+                                                 _("mcen_ti_edit_delete"), _HL_DELETE,
                                                  GTK_TREE_VIEW (priv->header_view),
                                                  GTK_SELECTION_MULTIPLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_message));
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE,
-                                                 _("mcen_ti_edit_move"), _HL("wdgt_bd_move"),
+                                                 _("mcen_ti_edit_move"), _HL_MOVE,
                                                  GTK_TREE_VIEW (priv->header_view),
                                                  GTK_SELECTION_MULTIPLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));
@@ -920,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),
@@ -1076,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
@@ -1150,12 +1168,15 @@ 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
 
        return FALSE;
 }
@@ -1423,6 +1444,7 @@ on_horizontal_movement (HildonPannableArea *hildonpannable,
 }
 #endif
 
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean
 on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
@@ -1453,3 +1475,4 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 
        return FALSE;
 }
+#endif