X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=4ae95ca24ffd049ef4599d77ee75d54d0d6fdbe4;hp=7e39bf7205d592008afbffd451ed5b39bc88a384;hb=67dfd8d57f7420b8d10d438d16a16d69674d11eb;hpb=895ef768f8f37f37b2d9c88bf115187177b45962

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 7e39bf7..4ae95ca 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -513,7 +513,7 @@ select_next_valid_row (GtkTreeModel *model,
 
 ModestWindow *
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
-					      const gchar *account_name,
+					      const gchar *modest_account_name,
 					      const gchar *msg_uid,
 					      GtkTreeModel *model, 
 					      GtkTreeRowReference *row_reference)
@@ -521,7 +521,7 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
 	ModestMsgViewWindow *window = NULL;
 	ModestMsgViewWindowPrivate *priv = NULL;
 
-	window = MODEST_MSG_VIEW_WINDOW(modest_msg_view_window_new (msg, account_name, msg_uid));
+	window = MODEST_MSG_VIEW_WINDOW(modest_msg_view_window_new (msg, modest_account_name, msg_uid));
 	g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL);
 
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@ -543,7 +543,7 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
 
 ModestWindow *
 modest_msg_view_window_new (TnyMsg *msg, 
-			    const gchar *account_name,
+			    const gchar *modest_account_name,
 			    const gchar *msg_uid)
 {
 	ModestMsgViewWindow *self = NULL;
@@ -665,7 +665,7 @@ modest_msg_view_window_new (TnyMsg *msg,
 						       G_CALLBACK (on_queue_changed),
 						       obj);
 
-	modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
+	modest_window_set_active_account (MODEST_WINDOW(obj), modest_account_name);
 
 	priv->last_search = NULL;
 
@@ -1091,12 +1091,13 @@ static gboolean
 message_reader (ModestMsgViewWindow *window,
 		ModestMsgViewWindowPrivate *priv,
 		TnyHeader *header,
-		GtkTreeIter iter)
+		GtkTreePath *path)
 {
 	ModestMailOperation *mail_op = NULL;
-	GtkTreePath *path = NULL;
 	ModestMailOperationTypeOperation op_type;
 
+	g_return_val_if_fail (path != NULL, FALSE);
+
 	/* Msg download completed */
 	if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) {
 		op_type = MODEST_MAIL_OPERATION_TYPE_OPEN;
@@ -1126,9 +1127,6 @@ message_reader (ModestMsgViewWindow *window,
 		}
 	}
 
-	/* Get the path, will be freed by the callback */
-	path = gtk_tree_model_get_path (priv->header_model, &iter);
-
 	/* New mail operation */
 	mail_op = modest_mail_operation_new_with_error_handling (op_type, 
 								 G_OBJECT(window),
@@ -1170,12 +1168,13 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
 			    &header, -1);
 	
 	/* Read the message & show it */
-	if (!message_reader (window, priv, header, tmp_iter))
+	if (!message_reader (window, priv, header, path)) {
 		retval = FALSE;
+		gtk_tree_path_free (path);
+	}
 
 	/* Free */
 	g_object_unref (header);
-	gtk_tree_path_free (path);
 
 	return retval;       	
 }
@@ -1186,6 +1185,7 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self)
 	ModestMsgViewWindowPrivate *priv = NULL;
 	TnyHeader *header = NULL;
 	GtkTreeIter iter;
+	GtkTreePath *path;
 
 	g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
@@ -1199,15 +1199,16 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self)
 			    &iter, 
 			    TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
 			    &header, -1);
-	
 	g_return_val_if_fail (TNY_IS_HEADER (header), FALSE);
 	if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED) {
 		g_object_unref (header);
 		return modest_msg_view_window_select_next_message (self);
 	}
 	
+	path = gtk_tree_model_get_path (priv->header_model, &iter);
+	
 	/* Read the message & show it */
-	message_reader (self, priv, header, iter);
+	message_reader (self, priv, header, path);
 	
 	/* Free */
 	g_object_unref (header);
@@ -1245,7 +1246,7 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
 		}
 
 		/* Read the message & show it */
-		if (!message_reader (window, priv, header, iter)) {
+		if (!message_reader (window, priv, header, path)) {
 			g_object_unref (header);
 			break;
 		}