diff -up libbonobo-2.20.4/bonobo/bonobo-running-context.h.deprecation libbonobo-2.20.4/bonobo/bonobo-running-context.h
--- libbonobo-2.20.4/bonobo/bonobo-running-context.h.deprecation	2008-01-29 10:28:33.000000000 -0500
+++ libbonobo-2.20.4/bonobo/bonobo-running-context.h	2008-01-29 10:30:51.000000000 -0500
@@ -49,9 +49,9 @@ void        bonobo_running_context_trace
 void        bonobo_running_context_at_exit_unref     (CORBA_Object object);
 
 #ifdef BONOBO_OBJECT_DEBUG
-#	define           bonobo_running_context_add_object_T(o)      G_STMT_START{bonobo_running_context_trace_objects((o),G_GNUC_PRETTY_FUNCTION,__LINE__,0);}G_STMT_END
-#	define           bonobo_running_context_remove_object_T(o)   G_STMT_START{bonobo_running_context_trace_objects((o),G_GNUC_PRETTY_FUNCTION,__LINE__,1);}G_STMT_END
-#	define           bonobo_running_context_ignore_object(o)     G_STMT_START{bonobo_running_context_trace_objects((o),G_GNUC_PRETTY_FUNCTION,__LINE__,2);}G_STMT_END
+#	define           bonobo_running_context_add_object_T(o)      G_STMT_START{bonobo_running_context_trace_objects((o),G_STRFUNC,__LINE__,0);}G_STMT_END
+#	define           bonobo_running_context_remove_object_T(o)   G_STMT_START{bonobo_running_context_trace_objects((o),G_STRFUNC,__LINE__,1);}G_STMT_END
+#	define           bonobo_running_context_ignore_object(o)     G_STMT_START{bonobo_running_context_trace_objects((o),G_STRFUNC,__LINE__,2);}G_STMT_END
 #endif
 
 G_END_DECLS
diff -up libbonobo-2.20.4/bonobo/bonobo-exception.h.deprecation libbonobo-2.20.4/bonobo/bonobo-exception.h
--- libbonobo-2.20.4/bonobo/bonobo-exception.h.deprecation	2008-01-29 10:28:10.000000000 -0500
+++ libbonobo-2.20.4/bonobo/bonobo-exception.h	2008-01-29 10:30:07.000000000 -0500
@@ -56,7 +56,7 @@
 		"file %s: line %d (%s): assertion `%s' failed.",	\
 		__FILE__,						\
 		__LINE__,						\
-		G_GNUC_PRETTY_FUNCTION,					\
+		G_STRFUNC,						\
 		#expr);							\
          return;                                                        \
      };	}G_STMT_END
@@ -71,7 +71,7 @@
 		"file %s: line %d (%s): assertion `%s' failed.",	\
 		__FILE__,						\
 		__LINE__,						\
-		G_GNUC_PRETTY_FUNCTION,					\
+		G_STRFUNC,						\
 		#expr);							\
          return val;                                                    \
      };	}G_STMT_END
diff -up libbonobo-2.20.4/bonobo/bonobo-object.h.deprecation libbonobo-2.20.4/bonobo/bonobo-object.h
--- libbonobo-2.20.4/bonobo/bonobo-object.h.deprecation	2008-01-29 10:28:23.000000000 -0500
+++ libbonobo-2.20.4/bonobo/bonobo-object.h	2008-01-29 10:29:43.000000000 -0500
@@ -117,8 +117,8 @@ gpointer                 bonobo_object_t
 							       gboolean                ref);
 
 #ifdef BONOBO_OBJECT_DEBUG
-#	define           bonobo_object_ref(o)   bonobo_object_trace_refs ((o),G_GNUC_PRETTY_FUNCTION,__LINE__,TRUE);
-#	define           bonobo_object_unref(o) bonobo_object_trace_refs ((o),G_GNUC_PRETTY_FUNCTION,__LINE__,FALSE);
+#	define           bonobo_object_ref(o)   bonobo_object_trace_refs ((o),G_STRFUNC ,__LINE__,TRUE);
+#	define           bonobo_object_unref(o) bonobo_object_trace_refs ((o),G_STRFUNC,__LINE__,FALSE);
 #endif	/* BONOBO_OBJECT_DEBUG */
 void                     bonobo_object_dump_interfaces        (BonoboObject *object);