[Xfce4-commits] r26469 - in xfce4-panel/trunk: . panel

[Nick Schermer]

Author: nick
Date: 2007-12-13 10:25:48 +0000 (Thu, 13 Dec 2007)
New Revision: 26469

Modified:
   xfce4-panel/trunk/configure.in.in
   xfce4-panel/trunk/panel/panel-app.c
Log:
* Don't allow deprecated glib functions.
* Replace deprecated io channel function.


Modified: xfce4-panel/trunk/configure.in.in
===================================================================
--- xfce4-panel/trunk/configure.in.in	2007-12-13 10:24:53 UTC (rev 26468)
+++ xfce4-panel/trunk/configure.in.in	2007-12-13 10:25:48 UTC (rev 26469)
@@ -151,10 +151,11 @@
 dnl *************************
 GTK_DOC_CHECK([1.0])
 
-dnl ******************************************
-dnl *** Disable deprecated Xfce components ***
-dnl ******************************************
+dnl *************************************
+dnl *** Disable deprecated components ***
+dnl *************************************
 AC_DEFINE([XFCE_DISABLE_DEPRECATED], [1], [Define to 1 to disable deprecated Xfce components])
+AC_DEFINE([G_DISABLE_DEPRECATED], [1], [Define to 1 to disable deprecated Glib components])
 
 dnl ***********************************
 dnl *** Check for debugging support ***

Modified: xfce4-panel/trunk/panel/panel-app.c
===================================================================
--- xfce4-panel/trunk/panel/panel-app.c	2007-12-13 10:24:53 UTC (rev 26468)
+++ xfce4-panel/trunk/panel/panel-app.c	2007-12-13 10:25:48 UTC (rev 26469)
@@ -296,9 +296,9 @@
     gint  signal;
     gsize bytes_read;
 
-    if (G_IO_ERROR_NONE == g_io_channel_read (source, (gchar *)&signal, 
-                                              sizeof (signal),
-                                              &bytes_read)
+    if (G_IO_STATUS_NORMAL == g_io_channel_read_chars (source, (gchar *)&signal, 
+                                                       sizeof (signal),
+                                                       &bytes_read, NULL)
         && sizeof(signal) == bytes_read)
     {
         switch (signal)