evolution-exchange r1641 - in trunk: . mail

[tml svn gnome org]

Author: tml
Date: Thu May  8 01:20:02 2008
New Revision: 1641
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1641&view=rev

Log:
2008-05-08  Tor Lillqvist  <tml novell com>

	* mail/mail-stub.c No need to include <sys/socket.h> and
	<sys/un.h> in this file.
	(mail_stub_construct): Use g_io_channel_win32_new_socket() on
	Windows as we know that the fd is actually a socket.



Modified:
   trunk/ChangeLog
   trunk/mail/mail-stub.c

Modified: trunk/mail/mail-stub.c
==============================================================================
--- trunk/mail/mail-stub.c	(original)
+++ trunk/mail/mail-stub.c	Thu May  8 01:20:02 2008
@@ -24,8 +24,6 @@
 #endif
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
 #include <unistd.h>
 
 #include <e2k-uri.h>
@@ -766,7 +764,11 @@
 void
 mail_stub_construct (MailStub *stub, int cmd_fd, int status_fd)
 {
+#ifndef G_OS_WIN32
 	stub->channel = g_io_channel_unix_new (cmd_fd);
+#else
+	stub->channel = g_io_channel_win32_new_socket (cmd_fd);
+#endif
 	g_io_add_watch (stub->channel, G_IO_IN | G_IO_ERR | G_IO_HUP,
 			connection_handler, stub);
 	stub->cmd = camel_stub_marshal_new (cmd_fd);