[Commits] main.c 1.115.2.256 1.115.2.257

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv8569/src

Modified Files:
      Tag: gtk2
	main.c 
Log Message:
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.

Index: main.c
===================================================================
RCS file: /home/claws-mail/claws/src/main.c,v
retrieving revision 1.115.2.256
retrieving revision 1.115.2.257
diff -u -d -r1.115.2.256 -r1.115.2.257
--- main.c	11 Sep 2012 19:35:25 -0000	1.115.2.256
+++ main.c	13 Sep 2012 08:07:25 -0000	1.115.2.257
@@ -1406,13 +1406,6 @@
 	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 @@
 		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();