2012-09-13 [colin] 3.8.1cvs56
authorColin Leroy <colin@colino.net>
Thu, 13 Sep 2012 08:07:27 +0000 (08:07 +0000)
committerColin Leroy <colin@colino.net>
Thu, 13 Sep 2012 08:07:27 +0000 (08:07 +0000)
* src/main.c
Don't listen on the Unix socket before we're
ready. The 'popup' order from another instance
may provoke a race and trash configuration files.

ChangeLog
PATCHSETS
configure.ac
src/main.c

index f8c57a7..8fbab37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-13 [colin]     3.8.1cvs56
+
+       * src/main.c
+               Don't listen on the Unix socket before we're
+               ready. The 'popup' order from another instance
+               may provoke a race and trash configuration files.
+
 2012-09-13 [colin]     3.8.1cvs55
 
        * src/imap.c
index 901645b..fe2acb4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.150.2.127 -r 1.150.2.128 src/procmsg.c;  ) > 3.8.1cvs53.patchset
 ( cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/prefs_other.c;  ) > 3.8.1cvs54.patchset
 ( cvs diff -u -r 1.179.2.260 -r 1.179.2.261 src/imap.c;  ) > 3.8.1cvs55.patchset
+( cvs diff -u -r 1.115.2.256 -r 1.115.2.257 src/main.c;  ) > 3.8.1cvs56.patchset
index f1373f5..3158128 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=55
+EXTRA_VERSION=56
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index ef0a31e..3bc9664 100644 (file)
@@ -1406,13 +1406,6 @@ int main(int argc, char *argv[])
        gtk_cmclist_freeze(GTK_CMCLIST(mainwin->folderview->ctree));
        folder_item_update_freeze();
 
-       /* register the callback of unix domain socket input */
-       lock_socket_tag = claws_input_add(lock_socket,
-                                       G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
-                                       lock_socket_input_cb,
-                                       mainwin, TRUE);
-
-
        prefs_account_init();
        account_read_config_all();
 
@@ -1691,6 +1684,13 @@ int main(int argc, char *argv[])
                main_window_set_menu_sensitive(mainwin);
                toolbar_main_set_sensitive(mainwin);
        }
+
+       /* register the callback of unix domain socket input */
+       lock_socket_tag = claws_input_add(lock_socket,
+                                       G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
+                                       lock_socket_input_cb,
+                                       mainwin, TRUE);
+
        END_TIMING();
 
        gtk_main();