From ca454566da5e5219f277c0b671335ca22b19cf0d Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 23 May 2008 05:12:52 +0000 Subject: [PATCH] 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' --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/mainwindow.c | 2 +- src/summaryview.c | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 290e25e15..f171c933f 100644 --- 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 dae8e1579..dc656c9ce 100644 --- 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 3d89baace..6feda5121 100644 --- 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 03e51ad6d..99c560404 100644 --- 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 fe0d01632..7bb5c119b 100644 --- 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) -- 2.25.1