2006-07-31 [paul] 2.3.1cvs89
authorPaul Mangan <paul@claws-mail.org>
Mon, 31 Jul 2006 06:45:10 +0000 (06:45 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 31 Jul 2006 06:45:10 +0000 (06:45 +0000)
* src/account.c
* src/main.c
* src/mainwindow.c
* src/mainwindow.h
Fix a race condition when, after an SC crash, rescanning
folders took more than 0.5 seconds
Thanks to Colin

ChangeLog
PATCHSETS
configure.ac
src/account.c
src/main.c
src/mainwindow.c
src/mainwindow.h

index b53a95aba1bbd044ff3d177cbbc53651c42b57d6..f95ad56cd2a471c482662a2b8a78430503e9d196 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-07-31 [paul]      2.3.1cvs89
+
+       * src/account.c
+       * src/main.c
+       * src/mainwindow.c
+       * src/mainwindow.h
+               Fix a race condition when, after an SC crash, rescanning
+               folders took more than 0.5 seconds
+               Thanks to Colin
+
 2006-07-31 [paul]      2.3.1cvs88
 
        * src/folderview.c
index adfa323cbf30906a9d688fdc9853ea354a700e62..58554f9d53e7e20a211aa3bf7bd5ade1cd557b1d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.96.2.127 -r 1.96.2.128 src/textview.c;  ) > 2.3.1cvs86.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 doc/man/sylpheed-claws.1;  cvs diff -u -r 1.60.2.31 -r 1.60.2.32 po/es.po;  ) > 2.3.1cvs87.patchset
 ( cvs diff -u -r 1.207.2.109 -r 1.207.2.110 src/folderview.c;  ) > 2.3.1cvs88.patchset
+( cvs diff -u -r 1.61.2.47 -r 1.61.2.48 src/account.c;  cvs diff -u -r 1.115.2.97 -r 1.115.2.98 src/main.c;  cvs diff -u -r 1.274.2.126 -r 1.274.2.127 src/mainwindow.c;  cvs diff -u -r 1.39.2.17 -r 1.39.2.18 src/mainwindow.h;  ) > 2.3.1cvs89.patchset
index 4e26d256f5ddf09489d00af1471f5b95e11ff723..8684cdcde07d40167dc3ca5cefa2abc4a6743d0f 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=88
+EXTRA_VERSION=89
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 9f575d6773233d23833f00ae9fe0bd2569427c1a..44d83d5f01451f824e51407d9435576d8e4e2769 100644 (file)
@@ -223,7 +223,7 @@ void account_read_config_all(void)
        }
 
        account_set_menu();
-       main_window_reflect_prefs_all();
+       main_window_reflect_prefs_all_now();
 
        while (ac_label_list) {
                g_free(ac_label_list->data);
index 5694a58e2d49b72b5a33575168984c61c11c5c96..4dd228f0083b7d4c5de150f308c0b4e4c291f903 100644 (file)
@@ -1276,6 +1276,7 @@ static void quit_signal_handler(int sig)
 #ifdef SIGPIPE
        if (sig == SIGPIPE) {
                debug_print("caugth SIGPIPE, maybe X closing!\n");
+               signal(SIGPIPE, SIG_IGN); /* ignore following sigpipes */
                folder_write_list();
                folder_func_to_all_folders(save_all_caches, GINT_TO_POINTER(0));
                return; 
index 9bf3bb90838a079d8543078bbbd7258bc4175ffd..cc7e413fd90acfe508cd49a0f380dbf978b6cd6c 100644 (file)
@@ -1475,6 +1475,11 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
        return FALSE;
 }
 
+void main_window_reflect_prefs_all_now(void)
+{
+       reflect_prefs_timeout_cb(GINT_TO_POINTER(FALSE));
+}
+
 void main_window_reflect_prefs_custom_colors(MainWindow *mainwin)
 {
        GtkMenuShell *menu;
index 50a2de58590458235a7061604069e4188c1a1c15..8e9b9fb141cbad1ade7f415d1e52b4a95b4bdd68 100644 (file)
@@ -153,6 +153,7 @@ void main_window_unlock                     (MainWindow     *mainwin);
 
 void main_window_reflect_prefs_all_real        (gboolean        pixmap_theme_changed);
 void main_window_reflect_prefs_all     (void);
+void main_window_reflect_prefs_all_now (void);
 void main_window_reflect_prefs_custom_colors(MainWindow        *mainwindow);
 void main_window_set_summary_column    (void);
 void main_window_set_folder_column     (void);