[Xfce4-commits] r26467 - in xfce-mcs-manager/trunk: . xfce-mcs-manager

[Nick Schermer]

Author: nick
Date: 2007-12-13 10:16:57 +0000 (Thu, 13 Dec 2007)
New Revision: 26467

Modified:
   xfce-mcs-manager/trunk/ChangeLog
   xfce-mcs-manager/trunk/xfce-mcs-manager/Makefile.am
   xfce-mcs-manager/trunk/xfce-mcs-manager/xfce-mcs-manager.c
Log:
	* xfce-mcs-manager/Makefile.am: Don't allow deprecated Glib
	  functions.
	* xfce-mcs-manager/xfce-mcs-manager.c: Fix compiler warnings.

Modified: xfce-mcs-manager/trunk/ChangeLog
===================================================================
--- xfce-mcs-manager/trunk/ChangeLog	2007-12-13 09:51:47 UTC (rev 26466)
+++ xfce-mcs-manager/trunk/ChangeLog	2007-12-13 10:16:57 UTC (rev 26467)
@@ -1,3 +1,9 @@
+2007-12-13 Nick Schermer <nick at xfce.org>
+
+	* xfce-mcs-manager/Makefile.am: Don't allow deprecated Glib
+	  functions.
+	* xfce-mcs-manager/xfce-mcs-manager.c: Fix compiler warnings.
+
 2007-01-04 19:07  nick
 
 	* xfce-mcs-manager/xfce-mcs-dialog.c: Open the dialog on the

Modified: xfce-mcs-manager/trunk/xfce-mcs-manager/Makefile.am
===================================================================
--- xfce-mcs-manager/trunk/xfce-mcs-manager/Makefile.am	2007-12-13 09:51:47 UTC (rev 26466)
+++ xfce-mcs-manager/trunk/xfce-mcs-manager/Makefile.am	2007-12-13 10:16:57 UTC (rev 26467)
@@ -6,6 +6,7 @@
 	-DG_LOG_DOMAIN=\"xfce-mcs-manager\"				\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-DPLUGINSDIR=\"$(libdir)/xfce4/mcs-plugins\"			\
+	-DG_DISABLE_DEPRECATED						\
 	$(PLATFORM_CPPFLAGS)
 
 bin_PROGRAMS =								\

Modified: xfce-mcs-manager/trunk/xfce-mcs-manager/xfce-mcs-manager.c
===================================================================
--- xfce-mcs-manager/trunk/xfce-mcs-manager/xfce-mcs-manager.c	2007-12-13 09:51:47 UTC (rev 26466)
+++ xfce-mcs-manager/trunk/xfce-mcs-manager/xfce-mcs-manager.c	2007-12-13 10:16:57 UTC (rev 26467)
@@ -314,6 +314,7 @@
 sighandler (int signo)
 {
     guint32 sigstate;
+    gint    ignore;
     
     switch (signo)
     {
@@ -326,7 +327,7 @@
             break;
     }
     
-    write (signal_pipe[1], &sigstate, sizeof (sigstate));
+    ignore = write (signal_pipe[1], &sigstate, sizeof (sigstate));
 }
 
 static gboolean
@@ -337,8 +338,8 @@
     guint32 sigstate = 0;
     gsize bread = 0;
     
-    if (G_IO_ERROR_NONE == g_io_channel_read (source, (gchar *)&sigstate,
-                                              sizeof (sigstate), &bread)
+    if (G_IO_STATUS_NORMAL == g_io_channel_read_chars (source, (gchar *)&sigstate,
+                                                       sizeof (sigstate), &bread, NULL)
         && sizeof (sigstate) == bread)
     {
         switch (sigstate)