2008-05-23 [colin] 3.4.0cvs64

	* src/mainwindow.c
	* src/summaryview.c
		Fix bug 1610, 'claws crash after opening/closing
		preferences and window update'

diff --git a/ChangeLog b/ChangeLog
index 290e25e152c325a5999e1cec3df9ebf527ea3211..f171c933f36488ed62b6a35b0fab54a160654334 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-23 [colin]     3.4.0cvs64
+
+       * src/mainwindow.c
+       * src/summaryview.c
+               Fix bug 1610, 'claws crash after opening/closing 
+               preferences and window update'
+
 2008-05-22 [colin]     3.4.0cvs63
 
        * src/prefs_filtering_action.c

diff --git a/PATCHSETS b/PATCHSETS
index dae8e1579a5d24fe7844ca85adf5a5021a96f4ed..dc656c9cec94da96730bdc8b213d087c61197c58 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3359,3 +3359,4 @@
 ( cvs diff -u -r 1.36.2.140 -r 1.36.2.141 src/common/utils.c;  ) > 3.4.0cvs61.patchset
 ( cvs diff -u -r 1.155.2.85 -r 1.155.2.86 src/Makefile.am;  cvs diff -u -r 1.30.2.50 -r 1.30.2.51 src/prefs_toolbar.c;  cvs diff -u -r 1.25.2.55 -r 1.25.2.56 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.34 -r 1.18.2.35 src/stock_pixmap.h;  cvs diff -u -r 1.43.2.99 -r 1.43.2.100 src/toolbar.c;  diff -u /dev/null src/pixmaps/delete_btn.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/insert_file.xpm;  diff -u /dev/null src/pixmaps/mail_reply_to_list.xpm;  ) > 3.4.0cvs62.patchset
 ( cvs diff -u -r 1.1.4.51 -r 1.1.4.52 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/combobox.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/combobox.h;  ) > 3.4.0cvs63.patchset
+( cvs diff -u -r 1.274.2.243 -r 1.274.2.244 src/mainwindow.c;  cvs diff -u -r 1.395.2.368 -r 1.395.2.369 src/summaryview.c;  ) > 3.4.0cvs64.patchset

diff --git a/configure.ac b/configure.ac
index 3d89baaceacba788c3b5137cd63dabc945855e8c..6feda51219cf1cb384936bee3e092b1a6943c417 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=63
+EXTRA_VERSION=64
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 03e51ad6d3766e15d4bf414a0782a8f1d7c80c6f..99c5604040a5b0141523a013d9c96398f6ec0a5e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2143,7 +2143,7 @@ void main_window_reflect_tags_changes(MainWindow *mainwin)
 
 void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 {
-       if (prefs_tag == 0 || pixmap_theme_changed) {
+       if (prefs_tag == 0) {
                prefs_tag = g_timeout_add(500, reflect_prefs_timeout_cb, 
                                                GINT_TO_POINTER(pixmap_theme_changed));
        }

diff --git a/src/summaryview.c b/src/summaryview.c
index fe0d01632f44e43b3a394046a9aaf6af8af11080..7bb5c119bd45ff208f2b42ee4f1d2b97cc0a6177 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -6208,6 +6208,7 @@ void summary_set_column_order(SummaryView *summaryview)
 
        summary_select_by_msgnum(summaryview, selected_msgnum);
 
+       summaryview->selected = summary_find_msg_by_msgnum(summaryview, selected_msgnum);
        summaryview->displayed = summary_find_msg_by_msgnum(summaryview, displayed_msgnum);
        summaryview->last_displayed = summaryview->displayed;
        if (!summaryview->displayed)