gconf r2535 - in trunk: . gconf wrappers/guile

[chpe svn gnome org]

Author: chpe
Date: Mon Jan 28 12:36:22 2008
New Revision: 2535
URL: http://svn.gnome.org/viewvc/gconf?rev=2535&view=rev

Log:
2008-01-28  Christian Persch  <chpe gnome org>

	* gconf/gconf-internals.c: (gconf_value_from_corba_value),
	(gconf_fill_corba_value_from_gconf_value), (gconf_value_decode):
	* gconf/gconf.c: (gconf_engine_all_entries):
	* wrappers/guile/scm-gconf.c: (gconf_value_to_scm): Use G_STRFUNC
	instead of the deprecated G_GNUC_FUNCTION.

Modified:
   trunk/ChangeLog
   trunk/gconf/gconf-internals.c
   trunk/gconf/gconf.c
   trunk/wrappers/guile/scm-gconf.c

Modified: trunk/gconf/gconf-internals.c
==============================================================================
--- trunk/gconf/gconf-internals.c	(original)
+++ trunk/gconf/gconf-internals.c	Mon Jan 28 12:36:22 2008
@@ -161,7 +161,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;
     }
 
@@ -217,7 +217,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;
           }
 
@@ -238,7 +238,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);
                 
@@ -348,7 +348,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;
           }
         
@@ -387,7 +387,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;
     }
 }
@@ -1881,7 +1881,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;

Modified: trunk/gconf/gconf.c
==============================================================================
--- trunk/gconf/gconf.c	(original)
+++ trunk/gconf/gconf.c	Mon Jan 28 12:36:22 2008
@@ -189,7 +189,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);
@@ -1700,7 +1700,7 @@
   if (keys->_length != values->_length)
     {
       g_warning("Received unmatched key/value sequences in %s",
-                G_GNUC_FUNCTION);
+                G_STRFUNC);
       return NULL;
     }
 

Modified: trunk/wrappers/guile/scm-gconf.c
==============================================================================
--- trunk/wrappers/guile/scm-gconf.c	(original)
+++ trunk/wrappers/guile/scm-gconf.c	Mon Jan 28 12:36:22 2008
@@ -135,7 +135,7 @@
                        gconf_value_to_scm(gconf_value_get_cdr(val)));
       break;
     default:
-      g_warning("Unhandled type in %s", G_GNUC_FUNCTION);
+      g_warning("Unhandled type in %s", G_STRFUNC);
       break;
     }