diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
index f65fba7..09eaad2 100644
--- a/gconf/gconf-dbus.c
+++ b/gconf/gconf-dbus.c
@@ -164,7 +164,7 @@ static DBusHandlerResult
   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)
 
 
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index 8aaf3e7..38a9e80 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -1906,7 +1906,7 @@ gconf_value_decode (const gchar* encoded)
         
         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;
