* some cleanups for debugging:

[modest] / src / maemo / modest-msg-view-window.c

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 92ea300..7e0e61b 100644 (file)
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -140,7 +140,9 @@ static void on_move_focus (ModestMsgViewWindow *window,
 
 static void view_msg_cb         (ModestMailOperation *mail_op, 
                                 TnyHeader *header, 
+                                gboolean canceled,
                                 TnyMsg *msg, 
+                                GError *error,
                                 gpointer user_data);
 
 static void set_toolbar_mode    (ModestMsgViewWindow *self, 
@@ -159,7 +161,7 @@ enum {
 
 static const GtkToggleActionEntry msg_view_toggle_action_entries [] = {
        { "FindInMessage",    MODEST_TOOLBAR_ICON_FIND,    N_("qgn_toolb_gene_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE },
-       { "ToolsFindInMessage", NULL, N_("mcen_me_viewer_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE },
+       { "ToolsFindInMessage", NULL, N_("mcen_me_viewer_find"), "<CTRL>F", NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE },
 };
 
 static const GtkRadioActionEntry msg_view_zoom_action_entries [] = {
@@ -1096,10 +1098,9 @@ void modest_msg_view_window_update_model_replaced(
         * not care about it's model (msg list). Else if the
         * header-view shows the folder the msg shown by us is in, we
         * shall replace our model reference and make some check. */
-       if(tny_folder_id == NULL ||
-                       !g_str_equal(tny_folder_id, priv->header_folder_id))
+       if(tny_folder_id == NULL || !g_str_equal(tny_folder_id, priv->header_folder_id))
                return;
-
+       
        /* Model is changed(replaced), so we should forget the old
         * one. Because there might be other references and there
         * might be some change on the model even if we unreferenced
@@ -1133,9 +1134,6 @@ void modest_msg_view_window_update_model_replaced(
 
        modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window));
 
-       if(tny_folder_id == NULL)
-               return;
-
        g_assert(model != NULL);
 
        /* Also we must connect to the new model for row insertions.
@@ -1207,15 +1205,12 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self)
 TnyMsg*
 modest_msg_view_window_get_message (ModestMsgViewWindow *self)
 {
-       ModestMsgView *msg_view;
        ModestMsgViewWindowPrivate *priv;
-
+       
        g_return_val_if_fail (self, NULL);
-
+       
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
-
-       msg_view = MODEST_MSG_VIEW (priv->msg_view);
-
+       
        return tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
 }
 
@@ -1777,7 +1772,9 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
 static void
 view_msg_cb (ModestMailOperation *mail_op, 
             TnyHeader *header, 
+            gboolean canceled,
             TnyMsg *msg, 
+            GError *error,
             gpointer user_data)
 {
        ModestMsgViewWindow *self = NULL;
@@ -2509,6 +2506,9 @@ show_remove_attachment_information (gpointer userdata)
        ModestMsgViewWindow *window = (ModestMsgViewWindow *) userdata;
        ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
+       /* We're outside the main lock */
+       gdk_threads_enter ();
+
        if (priv->remove_attachment_banner != NULL) {
                gtk_widget_destroy (priv->remove_attachment_banner);
                g_object_unref (priv->remove_attachment_banner);
@@ -2517,6 +2517,8 @@ show_remove_attachment_information (gpointer userdata)
        priv->remove_attachment_banner = g_object_ref (
                hildon_banner_show_animation (NULL, NULL, _("mcen_ib_removing_attachment")));
 
+       gdk_threads_leave ();
+
        return FALSE;
 }