diff -up evolution-data-server-2.21.91/servers/exchange/storage/exchange-account.c.no-gnuc-pretty-function evolution-data-server-2.21.91/servers/exchange/storage/exchange-account.c
--- evolution-data-server-2.21.91/servers/exchange/storage/exchange-account.c.no-gnuc-pretty-function	2008-01-12 04:21:01.000000000 -0500
+++ evolution-data-server-2.21.91/servers/exchange/storage/exchange-account.c	2008-02-12 14:27:30.000000000 -0500
@@ -1886,7 +1886,7 @@ add_folder (gpointer key, gpointer value
 {
 	EFolder *folder = value;
 
-	d(g_print ("%s(%d):%s: key=[%s]\t folder-path=[%s]\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION,
+	d(g_print ("%s:%s: key=[%s]\t folder-path=[%s]\n", G_STRLOC, G_STRFUNC,
 		   key, e_folder_exchange_get_path (folder)));
 
 	/* Each folder appears under three different keys, but
diff -up evolution-data-server-2.21.91/addressbook/libebook/e-book.c.no-gnuc-pretty-function evolution-data-server-2.21.91/addressbook/libebook/e-book.c
--- evolution-data-server-2.21.91/addressbook/libebook/e-book.c.no-gnuc-pretty-function	2007-11-29 07:53:48.000000000 -0500
+++ evolution-data-server-2.21.91/addressbook/libebook/e-book.c	2008-02-12 14:27:30.000000000 -0500
@@ -4012,7 +4012,7 @@ e_book_dispose (GObject *object)
 			CORBA_exception_init (&ev);
 			bonobo_object_release_unref  (book->priv->corba_book, &ev);
 			if (ev._major != CORBA_NO_EXCEPTION)
-				g_warning ("%s: Exception releasing remote book interface!\n", G_GNUC_PRETTY_FUNCTION);
+				g_warning ("%s: Exception releasing remote book interface!\n", G_STRFUNC);
 			CORBA_exception_free (&ev);
 		}