2012-11-08 [colin] 3.8.1cvs116
authorColin Leroy <colin@colino.net>
Thu, 8 Nov 2012 11:42:27 +0000 (11:42 +0000)
committerColin Leroy <colin@colino.net>
Thu, 8 Nov 2012 11:42:27 +0000 (11:42 +0000)
* src/common/socket.c
* src/gtk/gtkutils.c
Fix socket communication

ChangeLog
PATCHSETS
configure.ac
src/common/socket.c
src/gtk/gtkutils.c

index 1d80d84..bd63f32 100644 (file)
--- 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
index 981433a..9022a62 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 6278dc8..9e6ab95 100644 (file)
@@ -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=
 
index 0e1c3d1..988493d 100644 (file)
@@ -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
index ac0afaa..e981b6d 100644 (file)
@@ -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;
 }