Index: gconf/gconf-dbus.c
===================================================================
--- gconf/gconf-dbus.c	(revision 705)
+++ gconf/gconf-dbus.c	(working copy)
@@ -164,7 +164,7 @@
   do { if ((engine)->owner && (engine)->owner_use_count == 0) \
       g_warning ("%s: You can't use a GConfEngine that has an active " \
 		 "GConfClient wrapper object. Use GConfClient API instead.", \
-		 G_GNUC_FUNCTION); \
+		 G_STRFUNC); \
   } while (0)
 
 
Index: gconf/testclient.c
===================================================================
--- gconf/testclient.c	(revision 705)
+++ gconf/testclient.c	(working copy)
@@ -90,15 +90,15 @@
 {
   GMainLoop* loop;
 
-  loop = g_main_new(TRUE);
+  loop = g_main_loop_new(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);
 }
 
 
Index: gconf/gconf-internals.c
===================================================================
--- gconf/gconf-internals.c	(revision 705)
+++ gconf/gconf-internals.c	(working copy)
@@ -185,7 +185,7 @@
       type = GCONF_VALUE_PAIR;
       break;
     default:
-      gconf_log(GCL_DEBUG, "Invalid type in %s", G_GNUC_FUNCTION);
+      gconf_log(GCL_DEBUG, "Invalid type in %s", G_STRFUNC);
       return NULL;
     }
 
@@ -241,7 +241,7 @@
           case BInvalidVal:
             break;
           default:
-            g_warning("Bizarre list type in %s", G_GNUC_FUNCTION);
+            g_warning("Bizarre list type in %s", G_STRFUNC);
             break;
           }
 
@@ -262,7 +262,7 @@
                 if (val == NULL)
                   gconf_log(GCL_ERR, _("Couldn't interpret CORBA value for list element"));
                 else if (val->type != gconf_value_get_list_type(gval))
-                  gconf_log(GCL_ERR, _("Incorrect type for list element in %s"), G_GNUC_FUNCTION);
+                  gconf_log(GCL_ERR, _("Incorrect type for list element in %s"), G_STRFUNC);
                 else
                   list = g_slist_prepend(list, val);
                 
@@ -372,7 +372,7 @@
             
           default:
             cv->_u.list_value.list_type = BInvalidVal;
-            gconf_log(GCL_DEBUG, "Invalid list type in %s", G_GNUC_FUNCTION);
+            gconf_log(GCL_DEBUG, "Invalid list type in %s", G_STRFUNC);
             break;
           }
         
@@ -411,7 +411,7 @@
       break;
     default:
       cv->_d = InvalidVal;
-      gconf_log(GCL_DEBUG, "Unknown type in %s", G_GNUC_FUNCTION);
+      gconf_log(GCL_DEBUG, "Unknown type in %s", G_STRFUNC);
       break;
     }
 }
@@ -1906,7 +1906,7 @@
         
         d = g_strtod(s, &endptr);
         if (endptr == s)
-          g_warning("Failure converting string to double in %s", G_GNUC_FUNCTION);
+          g_warning("Failure converting string to double in %s", G_STRFUNC);
         gconf_value_set_float(val, d);
       }
       break;
Index: gconf/gconf.c
===================================================================
--- gconf/gconf.c	(revision 705)
+++ gconf/gconf.c	(working copy)
@@ -152,7 +152,7 @@
 
 #define CHECK_OWNER_USE(engine)   \
   do { if ((engine)->owner && (engine)->owner_use_count == 0) \
-     g_warning ("%s: You can't use a GConfEngine that has an active GConfClient wrapper object. Use GConfClient API instead.", G_GNUC_FUNCTION);  \
+     g_warning ("%s: You can't use a GConfEngine that has an active GConfClient wrapper object. Use GConfClient API instead.", G_STRFUNC);  \
   } while (0)
 
 static void         register_engine           (GConfEngine    *conf);
@@ -1663,7 +1663,7 @@
   if (keys->_length != values->_length)
     {
       g_warning("Received unmatched key/value sequences in %s",
-                G_GNUC_FUNCTION);
+                G_STRFUNC);
       return NULL;
     }
 
