diff -up evolution-2.21.90/mail/mail-send-recv.c.no-gnuc-function evolution-2.21.90/mail/mail-send-recv.c
--- evolution-2.21.90/mail/mail-send-recv.c.no-gnuc-function	2008-01-10 04:08:27.000000000 -0500
+++ evolution-2.21.90/mail/mail-send-recv.c	2008-01-29 10:28:54.000000000 -0500
@@ -714,7 +714,7 @@ receive_done (char *uri, void *data)
 		gtk_widget_set_sensitive (info->cancel_button, FALSE);
 
 	/* remove/free this active download */
-	d(printf("%s: freeing info %p\n", G_GNUC_FUNCTION, info));
+	d(printf("%s: freeing info %p\n", G_STRFUNC, info));
 	if (info->type == SEND_SEND)
 		g_hash_table_steal(info->data->active, SEND_URI_KEY);
 	else
diff -up evolution-2.21.90/widgets/menus/gal-view-collection.c.no-gnuc-function evolution-2.21.90/widgets/menus/gal-view-collection.c
--- evolution-2.21.90/widgets/menus/gal-view-collection.c.no-gnuc-function	2007-11-29 23:24:05.000000000 -0500
+++ evolution-2.21.90/widgets/menus/gal-view-collection.c	2008-01-29 10:28:54.000000000 -0500
@@ -753,7 +753,7 @@ gal_view_collection_append_with_title (G
 
 	gal_view_set_title (view, title);
 
-	d(g_print("%s: %p\n", G_GNUC_FUNCTION, view));
+	d(g_print("%s: %p\n", G_STRFUNC, view));
 
 	item = g_new(GalViewCollectionItem, 1);
 	item->ever_changed = TRUE;
@@ -791,7 +791,7 @@ gal_view_collection_set_nth_view (GalVie
 	g_return_val_if_fail (i >= 0, NULL);
 	g_return_val_if_fail (i < collection->view_count, NULL);
 
-	d(g_print("%s: %p\n", G_GNUC_FUNCTION, view));
+	d(g_print("%s: %p\n", G_STRFUNC, view));
 
 	item = collection->view_data[i];
 
diff -up evolution-2.21.90/widgets/menus/gal-view-instance.c.no-gnuc-function evolution-2.21.90/widgets/menus/gal-view-instance.c
--- evolution-2.21.90/widgets/menus/gal-view-instance.c.no-gnuc-function	2007-11-29 23:24:05.000000000 -0500
+++ evolution-2.21.90/widgets/menus/gal-view-instance.c	2008-01-29 10:28:54.000000000 -0500
@@ -375,7 +375,7 @@ gal_view_instance_set_current_view_id (G
 	g_return_if_fail (instance != NULL);
 	g_return_if_fail (GAL_IS_VIEW_INSTANCE (instance));
 
-	d(g_print("%s: view_id set to %s\n", G_GNUC_FUNCTION, view_id));
+	d(g_print("%s: view_id set to %s\n", G_STRFUNC, view_id));
 
 	if (instance->current_id && !strcmp (instance->current_id, view_id))
 		return;
diff -up evolution-2.21.90/widgets/menus/gal-view-menus.c.no-gnuc-function evolution-2.21.90/widgets/menus/gal-view-menus.c
--- evolution-2.21.90/widgets/menus/gal-view-menus.c.no-gnuc-function	2007-11-29 23:24:05.000000000 -0500
+++ evolution-2.21.90/widgets/menus/gal-view-menus.c	2008-01-29 10:28:54.000000000 -0500
@@ -491,10 +491,10 @@ void
 gal_view_menus_unmerge   (GalViewMenus      *gvm,
 			  CORBA_Environment *opt_ev)
 {
-	d(g_print ("%s:\n", G_GNUC_FUNCTION));
+	d(g_print ("%s:\n", G_STRFUNC));
 	if (bonobo_ui_component_get_container (gvm->priv->component) != NULL
 	    && bonobo_ui_component_path_exists  (gvm->priv->component, CURRENT_VIEW_PATH, opt_ev)) {
-		d(g_print ("%s: Removing path\n", G_GNUC_FUNCTION));
+		d(g_print ("%s: Removing path\n", G_STRFUNC));
 		bonobo_ui_component_rm (gvm->priv->component, CURRENT_VIEW_PATH, opt_ev);
 	}
 }
diff -up evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c.no-gnuc-function evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c
--- evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c.no-gnuc-function	2007-11-29 23:23:58.000000000 -0500
+++ evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c	2008-01-29 10:28:54.000000000 -0500
@@ -192,7 +192,7 @@ column_width_changed (EMinicardViewWidge
 	GtkAdjustment *adj;
 	GtkAdjustment *adj_new;
 
-	d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width));
+	d(g_print("%s: Old width = %f, New width = %f\n", G_STRFUNC, view->column_width, width));
 	if (view->column_width != width) {
 		view->column_width = width;
 		gal_view_changed(GAL_VIEW(view));
diff -up evolution-2.21.90/addressbook/gui/widgets/e-minicard.c.no-gnuc-function evolution-2.21.90/addressbook/gui/widgets/e-minicard.c
--- evolution-2.21.90/addressbook/gui/widgets/e-minicard.c.no-gnuc-function	2008-01-27 22:59:43.000000000 -0500
+++ evolution-2.21.90/addressbook/gui/widgets/e-minicard.c	2008-01-29 10:28:54.000000000 -0500
@@ -347,7 +347,7 @@ e_minicard_set_property  (GObject *objec
 		}
 		break;
 	case PROP_HAS_CURSOR:
-		d(g_print("%s: PROP_HAS_CURSOR\n", G_GNUC_FUNCTION));
+		d(g_print("%s: PROP_HAS_CURSOR\n", G_STRFUNC));
 		if (e_minicard->has_cursor != g_value_get_boolean (value))
 			set_has_cursor (e_minicard, g_value_get_boolean (value));
 		break;
@@ -588,7 +588,7 @@ e_minicard_event (GnomeCanvasItem *item,
 	case GDK_FOCUS_CHANGE:
 		{
 			GdkEventFocus *focus_event = (GdkEventFocus *) event;
-			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_GNUC_FUNCTION, focus_event->in?"in":"out"));
+			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out"));
 			if (focus_event->in) {
 				/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it.  */
 				e_minicard->has_focus = TRUE;
diff -up evolution-2.21.90/shell/e-component-registry.c.no-gnuc-function evolution-2.21.90/shell/e-component-registry.c
--- evolution-2.21.90/shell/e-component-registry.c.no-gnuc-function	2007-11-29 23:23:59.000000000 -0500
+++ evolution-2.21.90/shell/e-component-registry.c	2008-01-29 10:28:54.000000000 -0500
@@ -343,7 +343,7 @@ e_component_registry_activate (EComponen
 
 	info = e_component_registry_peek_info (registry, ECR_FIELD_ID, id);
 	if (info == NULL) {
-		g_warning (G_GNUC_FUNCTION " - Unknown id \"%s\"", id);
+		g_warning (G_STRFUNC " - Unknown id \"%s\"", id);
 		return CORBA_OBJECT_NIL;
 	}
 
diff -up evolution-2.21.90/shell/e-shell-importer.c.no-gnuc-function evolution-2.21.90/shell/e-shell-importer.c
--- evolution-2.21.90/shell/e-shell-importer.c.no-gnuc-function	2007-11-29 23:23:59.000000000 -0500
+++ evolution-2.21.90/shell/e-shell-importer.c	2008-01-29 10:28:54.000000000 -0500
@@ -120,8 +120,8 @@ typedef struct _ImportData {
 /*#define IMPORTER_DEBUG*/
 
 #ifdef IMPORTER_DEBUG
-#define IN g_print ("=====> %s (%d)\n", G_GNUC_FUNCTION, __LINE__)
-#define OUT g_print ("<==== %s (%d)\n", G_GNUC_FUNCTION, __LINE__)
+#define IN g_print ("=====> %s (%d)\n", G_STRFUNC, __LINE__)
+#define OUT g_print ("<==== %s (%d)\n", G_STRFUNC, __LINE__)
 #else
 #define IN
 #define OUT