talons

commit ac5282d2952fb428d6b08b3a5042b4116ef3f4cb
parent 0cd779963f10ef205534dfa415831fe1738c88c6
Author: Colin Leroy <colin@colino.net>
Date:   Thu,  8 Nov 2012 11:42:27 +0000

2012-11-08 [colin]	3.8.1cvs116

	* src/common/socket.c
	* src/gtk/gtkutils.c
		Fix socket communication

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/socket.c
 | 
1
+
M
src/gtk/gtkutils.c
 | 
10
+++++++---

5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-08 [colin]	3.8.1cvs116
+
+	* src/common/socket.c
+	* src/gtk/gtkutils.c
+		Fix socket communication
+
 2012-11-08 [colin]	3.8.1cvs115
 
 	* src/plugins/pgpcore/sgpgme.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4490,3 +4490,4 @@
 ( cvs diff -u -r 1.28.2.54 -r 1.28.2.55 src/mbox.c;  ) > 3.8.1cvs113.patchset
 ( cvs diff -u -r 1.1.2.118 -r 1.1.2.119 src/gtk/quicksearch.c;  ) > 3.8.1cvs114.patchset
 ( cvs diff -u -r 1.1.2.74 -r 1.1.2.75 src/plugins/pgpcore/sgpgme.c;  ) > 3.8.1cvs115.patchset
+( cvs diff -u -r 1.13.2.50 -r 1.13.2.51 src/common/socket.c;  cvs diff -u -r 1.5.2.104 -r 1.5.2.105 src/gtk/gtkutils.c;  ) > 3.8.1cvs116.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=115
+EXTRA_VERSION=116
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/socket.c b/src/common/socket.c
@@ -1574,6 +1574,7 @@ gint fd_gets(gint fd, gchar *buf, gint len)
 		return -1;
 
 #ifdef G_OS_WIN32
+	fd_check_io(fd, G_IO_IN);
 	do {
 /*
 XXX:tm try nonblock
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
@@ -1646,10 +1646,14 @@ claws_io_invoke (GIOChannel   *source,
 	         gpointer      data)
 {
   ClawsIOClosure *closure = data;
-
+  int fd;
+#ifndef G_OS_WIN32
+  fd = g_io_channel_unix_get_fd (source);
+#else
+  fd = g_io_channel_win32_get_fd (source);
+#endif
   if (closure->condition & condition)
-    closure->function (closure->data, g_io_channel_unix_get_fd (source),
-    		       condition);
+    closure->function (closure->data, fd, condition);
 
   return TRUE;
 }