- fixes for glib-1.3.9

ChangeLog

@@ -1,3 +1,8 @@
+2001-10-13  Bastien Nocera  <hadess@hadess.net>
+
+	* configure.in, include/glibtop/errors.h, include/glibtop/global.h,
+	lib/glibtop-client.c, lib/test-backends.c: Fixes for glib-1.3.9
+
 2001-09-10  Abel Cheung  <maddog@linux.org.hk>
 
 	* configure.in: Added "zh_TW" to ALL_LINGUAS.

configure.in

@@ -91,13 +91,13 @@ AM_PROG_LIBTOOL
 dnl Let the user enable compiler warnings
 GNOME_COMPILE_WARNINGS
 
-GNOME_PKGCONFIG_CHECK_MODULES(GNOMESUPPORT, libgnomesupport-2.0:1.96.0)
+dnl PKGCONFIG_CHECK_MODULES(GNOMESUPPORT, libgnomesupport-2.0:1.96.0)
-AC_SUBST(GNOMESUPPORT_CFLAGS)
+dnl AC_SUBST(GNOMESUPPORT_CFLAGS)
-AC_SUBST(GNOMESUPPORT_LIBS)
+dnl AC_SUBST(GNOMESUPPORT_LIBS)
 
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 
-GNOME_PKGCONFIG_CHECK_MODULES(XML, libxml-2.0:2.2.8)
+PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.2.8)
 AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
 
@@ -122,7 +122,7 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
 AM_PROG_LIBTOOL
 
 dnl Check for glib
-GNOME_PKGCONFIG_CHECK_MODULES(GLIB, glib-2.0:1.3.1 gmodule-2.0:1.3.1 gobject-2.0:1.3.1)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.1 gmodule-2.0 >= 1.3.1 gobject-2.0 >= 1.3.1)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 

doc/ChangeLog

@@ -1,3 +1,9 @@
+2001-10-13  Bastien Nocera  <hadess@hadess.net>
+
+	reviewed by: <delete if not using a buddy>
+
+	* Makefile.am:
+
 2000-02-05  Martin Baulig  <martin@home-of-linux.org>
 
 	* reference.texi: Started to update documentation.

doc/Makefile.am

@@ -4,7 +4,7 @@ libgtop_TEXINFOS	= libgtop.texi about.texi reference.texi \
 			  auto-macros.texi version.texi main.texi \
 			  white-paper.texi internals.texi
 
-MAKEINFO		+= -I @libgtop_top_builddir@/doc
+MAKEINFO		= -I @libgtop_top_builddir@/doc
 
 EXTRA_DIST		= auto-macros.texi.in
 

include/glibtop/errors.h

@@ -28,7 +28,7 @@
 
 #include <glibtop.h>
 
-#include <gerror.h>
+#include <glib/gerror.h>
 
 G_BEGIN_DECLS
 

include/glibtop/global.h

@@ -47,7 +47,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include <gmacros.h>
+#include <glib/gmacros.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>

lib/glibtop-client.c

@@ -104,22 +104,22 @@ glibtop_client_class_init (glibtop_client_class *klass)
     parent_class = g_type_class_peek_parent (klass);
 
     glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_ERROR] =
-	g_signal_newc ("error",
+	g_signal_new ("error",
 		       G_TYPE_FROM_CLASS (klass),
 		       G_SIGNAL_RUN_LAST,
 		       G_STRUCT_OFFSET (glibtop_client_class, error),
 		       NULL, NULL,
 		       g_cclosure_marshal_VOID__POINTER,
-		       G_TYPE_NONE, 1, G_TYPE_POINTER);
+		       G_TYPE_NONE, 1, G_TYPE_POINTER, NULL);
 
     glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_WARNING] =
-	g_signal_newc ("warning",
+	g_signal_new ("warning",
 		       G_TYPE_FROM_CLASS (klass),
 		       G_SIGNAL_RUN_LAST,
 		       G_STRUCT_OFFSET (glibtop_client_class, warning),
 		       NULL, NULL,
 		       g_cclosure_marshal_VOID__POINTER,
-		       G_TYPE_NONE, 1, G_TYPE_POINTER);
+		       G_TYPE_NONE, 1, G_TYPE_POINTER, NULL);
 
     klass->error = glibtop_client_error_handler;
     klass->warning = glibtop_client_warning_handler;

lib/test-backends.c

@@ -36,7 +36,7 @@ main (int argc, char *argv [])
     GError *error = NULL;
     glibtop_cpu cpu;
 
-    g_type_init (G_TYPE_DEBUG_NONE);
+    g_type_init ();
 
     client = glibtop_client_new ();