2007-02-19 [colin] 2.7.2cvs52

	* src/folderview.c
		Fix bug 1033, 'Automatically refresh
		message list when new messages arrives'
		Looks like folderview->opened can sometimes
		be wrong...

diff --git a/ChangeLog b/ChangeLog
index 366254324bed37ed890493b66fa0bb1c075ff459..f9aefab5a672af63b277e348e4ab9662530d074d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-19 [colin]     2.7.2cvs52
+
+       * src/folderview.c
+               Fix bug 1033, 'Automatically refresh 
+               message list when new messages arrives'
+               Looks like folderview->opened can sometimes
+               be wrong...
+
 2007-02-19 [paul]      2.7.2cvs51
 
        * tools/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 7ef25aed9346ba26d6ad7dcbf2fe358262fb31d6..030f3406010fdce0bc1f2fd7d27c2ef92b616241 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2369,3 +2369,4 @@
 ( cvs diff -u -r 1.105.2.86 -r 1.105.2.87 src/prefs_account.c;  ) > 2.7.2cvs49.patchset
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/prefs_gpg.h;  cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/plugins/pgpmime/pgpmime.c;  ) > 2.7.2cvs50.patchset
 ( cvs diff -u -r 1.25.2.15 -r 1.25.2.16 tools/Makefile.am;  cvs diff -u -r 1.30.2.15 -r 1.30.2.16 tools/README;  diff -u /dev/null tools/thunderbird-filters-convertor.pl;  ) > 2.7.2cvs51.patchset
+( cvs diff -u -r 1.207.2.148 -r 1.207.2.149 src/folderview.c;  ) > 2.7.2cvs52.patchset

diff --git a/configure.ac b/configure.ac
index 00b21c289a8ddf1b249197ff1dd1d92c5387abab..266b4bff1bab6b964271ce00bddc4faa179a76b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=51
+EXTRA_VERSION=52
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 2e005d1c98761a8c6460cbc25cdd2573f15340d8..4be46d252921dfddf350ba795a8ccf7729039c49 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1669,7 +1669,9 @@ static gboolean folderview_update_item_claws(gpointer source, gpointer data)
                if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
                        folderview_update_node(folderview, node);
 
-               if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+               if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && 
+                    update_info->item == folderview->summaryview->folder_item &&
+                    update_info->item != NULL)
                        if (!quicksearch_is_active(folderview->summaryview->quicksearch))
                                summary_show(folderview->summaryview, update_info->item);
        }
@@ -2005,6 +2007,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        START_TIMING("");
        folderview->selected = row;
 
+       debug_print("newly selected %p, opened %p\n", folderview->selected, 
+                       folderview->opened);
        if (folderview->opened == row) {
                folderview->open_folder = FALSE;
                END_TIMING();
@@ -2016,6 +2020,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        gtkut_ctree_set_focus_row(ctree, folderview->opened);
                        gtk_ctree_select(ctree, folderview->opened);
                }
+               folderview->open_folder = FALSE;
                END_TIMING();
                return;
        }