X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-view-window.c;h=a148f895706e10756bfca7e4e92ef4d32c5d86a0;hb=e6036bf7993c2fae93ff7726988b37582a9df0b0;hp=edfb41d50fda6d188fe05bc7416b27f0365e6c08;hpb=92b37d3dbdca8d8a56af54102e705a7c2a0175de;p=modest

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index edfb41d..a148f89 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -533,7 +533,10 @@ init_window (ModestMsgViewWindow *obj)
 	priv->find_toolbar = hildon_find_toolbar_new (NULL);
 	hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
 	gtk_widget_set_no_show_all (priv->find_toolbar, TRUE);
-	
+
+	/* NULL-ize fields if the window is destroyed */
+	g_signal_connect (priv->msg_view, "destroy", G_CALLBACK (gtk_widget_destroyed), &(priv->msg_view));
+
 	gtk_widget_show_all (GTK_WIDGET(main_vbox));
 }
 
@@ -1467,7 +1470,6 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 			g_free (priv->last_search);
 			priv->last_search = NULL;
 		} else {
-			modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
 			hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
 		}
 	} else {
@@ -1477,7 +1479,6 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 			g_free (priv->last_search);
 			priv->last_search = NULL;
 		} else {
-			modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
 			hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
 		}
 	}
@@ -2196,7 +2197,6 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
 {
 	ModestMsgViewWindowPrivate *priv = NULL;
 	ModestWindowPrivate *parent_priv;
-	GtkWidget *reply_button = NULL, *menu = NULL;
 
 	parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
@@ -2218,13 +2218,6 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
 		hildon_window_add_toolbar (HILDON_WINDOW (self), 
 					   GTK_TOOLBAR (parent_priv->toolbar));
 
-		/* Set reply button tap and hold menu */
-		reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
-							  "/ToolBar/ToolbarMessageReply");
-		menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
-						  "/ToolbarReplyCSM");
-		if (menu && reply_button)
-			gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
 	}
 
 	if (show_toolbar) {
@@ -2769,7 +2762,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
 		/* In Hildon 2.2 save and delete operate over all the attachments as there's no
 		 * selection available */
 		mime_parts = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view));
-		if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts)) {
+		if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts, FALSE)) {
 			g_object_unref (mime_parts);
 			return;
 		}
@@ -2885,7 +2878,7 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
 	}
 	g_object_unref (iter);
 
-	if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts) ||
+	if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts, TRUE) ||
 	    tny_list_get_length (mime_parts) == 0) {
 		g_object_unref (mime_parts);
 		return;
@@ -2970,10 +2963,13 @@ update_window_title (ModestMsgViewWindow *window)
 	TnyHeader *header = NULL;
 	gchar *subject = NULL;
 
-	if (!GTK_WIDGET_VISIBLE (window))
+	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+	/* Note that if the window is closed while we're retrieving
+	   the message, this widget could de deleted */
+	if (!priv->msg_view)
 		return;
 
-	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 	msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
 
 	if (msg != NULL) {
@@ -3111,7 +3107,7 @@ on_fetch_image (ModestMsgView *msgview,
 		return FALSE;
 	}
 
-	return TRUE;;
+	return TRUE;
 }
 
 static void