From 6afd63f00a030cd2b0123d174d3e57a6c4f5cb10 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Sun, 27 Feb 2005 06:19:10 +0000
Subject: fixed a SSL bug.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@131 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog    | 5 +++++
 ChangeLog.ja | 5 +++++
 src/socket.c | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5fdfa7f3..e20b9a2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-27
+
+	* src/socket.c: sock_add_watch(): fixed a bug that g_io_add_watch()
+	  was called even on SSL connection. It has introduced random bugs.
+
 2005-02-25
 
 	* src/messageview.c: messageview_select_all(), reply_cb(): fixed
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 1e53a525..c5d5b3cd 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2005-02-27
+
+	* src/socket.c: sock_add_watch(): SSL 接続の場合でも g_io_add_watch()
+	  が呼ばれていたバグを修正。ランダムなバグを引き起こしていた。
+
 2005-02-25
 
 	* src/messageview.c: messageview_select_all(), reply_cb(): selection
diff --git a/src/socket.c b/src/socket.c
index 71810d20..f23dde62 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -333,7 +333,7 @@ guint sock_add_watch(SockInfo *sock, GIOCondition condition, SockFunc func,
 		((SockSource *)source)->sock = sock;
 		g_source_set_priority(source, G_PRIORITY_DEFAULT);
 		g_source_set_can_recurse(source, FALSE);
-		g_source_attach(source, NULL);
+		return g_source_attach(source, NULL);
 	}
 #endif
 
-- 
cgit v1.2.3