SF.net SVN: geany: [1613] trunk

[ntrel at users.sourceforge.net]

Revision: 1613
          http://svn.sourceforge.net/geany/?rev=1613&view=rev
Author:   ntrel
Date:     2007-06-13 05:00:23 -0700 (Wed, 13 Jun 2007)

Log Message:
-----------
Use g_io_channel_win32_new_fd() as recommended in GLib docs for
utils_set_up_io_channel() on Windows. (Unlikely to change behaviour
though).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/build.c
    trunk/src/utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-06-12 16:45:24 UTC (rev 1612)
+++ trunk/ChangeLog	2007-06-13 12:00:23 UTC (rev 1613)
@@ -1,3 +1,11 @@
+2007-06-13  Nick Treleaven  <nick.treleaven at btinternet.com>
+
+ * src/build.c, src/utils.c:
+   Use g_io_channel_win32_new_fd() as recommended in GLib docs for
+   utils_set_up_io_channel() on Windows. (Unlikely to change behaviour
+   though).
+
+
 2007-06-12  Enrico Tröger  <enrico.troeger at uvena.de>
 
  * src/callbacks.c, src/dialogs.c:

Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c	2007-06-12 16:45:24 UTC (rev 1612)
+++ trunk/src/build.c	2007-06-13 12:00:23 UTC (rev 1613)
@@ -89,9 +89,7 @@
 static void set_stop_button(gboolean stop);
 static void build_exit_cb(GPid child_pid, gint status, gpointer user_data);
 static void run_exit_cb(GPid child_pid, gint status, gpointer user_data);
-static void
-on_build_arguments_activate            (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
+static void on_build_arguments_activate(GtkMenuItem *menuitem, gpointer user_data);
 
 #ifndef G_OS_WIN32
 static void kill_process(GPid *pid);

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2007-06-12 16:45:24 UTC (rev 1612)
+++ trunk/src/utils.c	2007-06-13 12:00:23 UTC (rev 1613)
@@ -1240,7 +1240,11 @@
 	GIOChannel *ioc;
 	//const gchar *encoding;
 
+	#ifdef G_OS_WIN32
+	ioc = g_io_channel_win32_new_fd(fd);
+	#else
 	ioc = g_io_channel_unix_new(fd);
+	#endif
 
 	if (nblock)
 		g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.