[anjal] BUGFIX: GNOME Bugzilla #590109 – Delete mail and move on to next undeleted mail

[Yan Li <yanli src gnome org>]

commit b43e0e426fa54c55fd1db939b6867ef00041d791
Author: Yan Li <yan i li intel com>
Date:   Thu Aug 13 17:32:49 2009 +0800

    BUGFIX: GNOME Bugzilla #590109 â?? Delete mail and move on to next undeleted mail
    
    The previous bug fix doesn't keep the row selection correctly. This
    patch fixed the problem.
    
    Signed-off-by: Yan Li <yan i li intel com>

 src/mail-folder-view.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/mail-folder-view.c b/src/mail-folder-view.c
index 57e34d4..d61318b 100644
--- a/src/mail-folder-view.c
+++ b/src/mail-folder-view.c
@@ -284,12 +284,15 @@ static void
 mfv_row_del (GtkTreeModel *model, GtkTreePath *path, MailFolderView *mfv)
 {
 	GtkTreeSelection *sel = gtk_tree_view_get_selection(mfv->tree);
-
-	if (gtk_tree_path_prev(path)) {
-		gtk_tree_selection_select_path (sel, path);
-	} else {
-		gtk_tree_selection_select_path (sel, path);
+	/* are we on last row now? */
+	GtkTreeIter iter;
+	gtk_tree_model_get_iter(model, &iter, path);
+	if (!gtk_tree_model_iter_next(model, &iter))
+	{
+		/* last row is selected and being deleted, move to prev row */
+		gtk_tree_path_prev(path);
 	}
+	gtk_tree_selection_select_path (sel, path);
 }
 
 static void