gconf r2731 - in trunk: . gconf

[matthiasc svn gnome org]

Author: matthiasc
Date: Sat Jan 10 04:42:03 2009
New Revision: 2731
URL: http://svn.gnome.org/viewvc/gconf?rev=2731&view=rev

Log:
       * gconf/testclient.c: Replace deprecated GLib calls. Patch by
        Travis Veralrud.

        * gconf/Makefile.am: Remove commented-out mentions of testclient.c



Modified:
   trunk/ChangeLog
   trunk/gconf/Makefile.am
   trunk/gconf/testclient.c

Modified: trunk/gconf/Makefile.am
==============================================================================
--- trunk/gconf/Makefile.am	(original)
+++ trunk/gconf/Makefile.am	Sat Jan 10 04:42:03 2009
@@ -76,11 +76,6 @@
 
 gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS) libgconf-$(MAJOR_VERSION).la
 
-# gconf_testclient_SOURCES = \
-# 	testclient.c
-
-# gconf_testclient_LDADD = $(GLIB_LIBS) $(OAF_LIBS) libgconf-client.la
-
 gconftool_2_SOURCES = \
 	gconftool.c
 

Modified: trunk/gconf/testclient.c
==============================================================================
--- trunk/gconf/testclient.c	(original)
+++ trunk/gconf/testclient.c	Sat Jan 10 04:42:03 2009
@@ -91,15 +91,15 @@
 {
   GMainLoop* loop;
 
-  loop = g_main_new(TRUE);
+  loop = g_main_loop_new(NULL, TRUE);
 
   main_loops = g_slist_prepend(main_loops, loop);
 
-  g_main_run(loop);
+  g_main_loop_run(loop);
 
   main_loops = g_slist_remove(main_loops, loop);
 
-  g_main_destroy(loop);
+  g_main_loop_unref(loop);
 }