--- GConf-2.14.0/gconf/gconf-client.c.errors	2006-10-06 12:25:25.000000000 -0400
+++ GConf-2.14.0/gconf/gconf-client.c	2006-10-06 12:55:06.000000000 -0400
@@ -1413,7 +1413,7 @@
 
   g_return_val_if_fail (err == NULL || *err == NULL, 0.0);
 
-  val = gconf_client_get (client, key, err);
+  val = gconf_client_get (client, key, error);
 
   if (val != NULL)
     {
@@ -1448,7 +1448,7 @@
 
   g_return_val_if_fail (err == NULL || *err == NULL, 0);
 
-  val = gconf_client_get (client, key, err);
+  val = gconf_client_get (client, key, error);
 
   if (val != NULL)
     {
@@ -1482,7 +1482,7 @@
 
   g_return_val_if_fail (err == NULL || *err == NULL, NULL);
 
-  val = gconf_client_get (client, key, err);
+  val = gconf_client_get (client, key, error);
 
   if (val != NULL)
     {
@@ -1518,7 +1518,7 @@
 
   g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-  val = gconf_client_get (client, key, err);
+  val = gconf_client_get (client, key, error);
 
   if (val != NULL)
     {
@@ -1552,7 +1552,7 @@
 
   g_return_val_if_fail (err == NULL || *err == NULL, NULL);
 
-  val = gconf_client_get (client, key, err);
+  val = gconf_client_get (client, key, error);
 
   if (val != NULL)
     {
@@ -1586,7 +1586,7 @@
 
   g_return_val_if_fail (err == NULL || *err == NULL, NULL);
 
-  val = gconf_client_get (client, key, err);
+  val = gconf_client_get (client, key, error);
 
   if (val != NULL)
     {
@@ -1625,7 +1625,7 @@
 
   g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-  val = gconf_client_get (client, key, err);
+  val = gconf_client_get (client, key, error);
 
   if (val != NULL)
     {
