xchat-gnome r2735 - in trunk: . src/common

[chpe svn gnome org]

Author: chpe
Date: Sun Apr 12 18:01:58 2009
New Revision: 2735
URL: http://svn.gnome.org/viewvc/xchat-gnome?rev=2735&view=rev

Log:
	* src/common/plugin.c: (xchat_read_fd):
	* src/common/server.c: (waitline2): Remove use of deprecated glib
	functions. Bug #572238, patch by Kyle Pelton.

Modified:
   trunk/ChangeLog
   trunk/src/common/plugin.c
   trunk/src/common/server.c

Modified: trunk/src/common/plugin.c
==============================================================================
--- trunk/src/common/plugin.c	(original)
+++ trunk/src/common/plugin.c	Sun Apr 12 18:01:58 2009
@@ -204,7 +204,9 @@
 static int
 xchat_read_fd (xchat_plugin *ph, GIOChannel *source, char *buf, int *len)
 {
-	return g_io_channel_read (source, buf, *len, len);
+        
+       return g_io_channel_read_chars(source, buf, *len, len, NULL);
+
 }
 #endif
 

Modified: trunk/src/common/server.c
==============================================================================
--- trunk/src/common/server.c	(original)
+++ trunk/src/common/server.c	Sun Apr 12 18:01:58 2009
@@ -848,7 +848,7 @@
 
 	while (1)
 	{
-		if (g_io_channel_read (source, &buf[i], 1, &len) != G_IO_ERROR_NONE)
+	        if (g_io_channel_read_chars(source, &buf[i], 1, &len, NULL) != G_IO_STATUS_NORMAL)
 			return -1;
 		if (buf[i] == '\n' || bufsize == i + 1)
 		{