aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-05-06 05:23:56 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-05-06 05:23:56 +0000
commitcfba26004dba1af652c6e82e489d75ef049a803d (patch)
tree92ce775a80e31929f1d422c27adcb374c7334832
parentf4f964e4f2c29d9a0709ce4423b0c47f802874bb (diff)
fixed async connection problem.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@235 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--src/socket.c2
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4dc9ae66..bbb3562b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-06
+
+ * src/socket.c: sock_connect_address_list_async(): only watch
+ G_IO_OUT to prevent a rare connection problem (thanks to Thorsten
+ Maerz).
+
2005-05-02
* src/prefs_filter_edit.c: prefs_filter_edit_set_cond_hbox_widgets():
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 735b52bf..c8733050 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2005-05-06
+
+ * src/socket.c: sock_connect_address_list_async(): 低確率で起こる
+ 接続の問題を避けるために G_IO_OUT のみを watch するようにした
+ (Thorsten Maerz さん thanks)。
+
2005-05-02
* src/prefs_filter_edit.c: prefs_filter_edit_set_cond_hbox_widgets():
diff --git a/src/socket.c b/src/socket.c
index 2c337ccb..8d2023fc 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -741,7 +741,7 @@ static gint sock_connect_address_list_async(SockConnectData *conn_data)
conn_data->cur_addr = conn_data->cur_addr->next;
conn_data->channel = g_io_channel_unix_new(sock);
- conn_data->io_tag = g_io_add_watch(conn_data->channel, G_IO_IN|G_IO_OUT,
+ conn_data->io_tag = g_io_add_watch(conn_data->channel, G_IO_OUT,
sock_connect_async_cb, conn_data);
return 0;