[evolution-data-server] Fix bug #603770, Replace __PRETY_FUNCTION__ with G_STRFUNC

[Jeff Cai <jeffcai src gnome org>]

commit 4af0e107ca7671c103042045ff1f49ba4025e446
Author: Jeff Cai <jeff cai sun com>
Date:   Wed Dec 9 12:36:33 2009 +0800

    Fix bug #603770, Replace __PRETY_FUNCTION__ with G_STRFUNC

 addressbook/libebook/e-error.h |    8 ++++----
 calendar/libecal/e-cal-view.c  |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/addressbook/libebook/e-error.h b/addressbook/libebook/e-error.h
index 39e8852..f8312c6 100644
--- a/addressbook/libebook/e-error.h
+++ b/addressbook/libebook/e-error.h
@@ -6,13 +6,13 @@
 		"file %s: line %d (%s): assertion `%s' failed",		\
 		__FILE__,						\
 		__LINE__,						\
-		__PRETTY_FUNCTION__,					\
+		G_STRFUNC,					\
 		#expr);							\
 	 g_set_error (error, E_BOOK_ERROR, (error_code),                \
 		"file %s: line %d (%s): assertion `%s' failed",		\
 		__FILE__,						\
 		__LINE__,						\
-		__PRETTY_FUNCTION__,					\
+		G_STRFUNC,					\
 		#expr);							\
 	 return FALSE;							\
        };				}G_STMT_END
@@ -21,7 +21,7 @@
     if G_LIKELY (expr) {} else {                                 \
       g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,                 \
              "file %s: line %d (%s): assertion `%s' failed",     \
-             __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr);    \
+             __FILE__, __LINE__, G_STRFUNC, #expr);    \
       cb (book, error, closure);                           \
       return 0;                                                  \
     }                                                            \
@@ -31,7 +31,7 @@
     if G_LIKELY (expr) {} else {                                 \
       g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,                 \
              "file %s: line %d (%s): assertion `%s' failed",     \
-             __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr);    \
+             __FILE__, __LINE__, G_STRFUNC, #expr);    \
       cb (book, error, NULL, closure);                           \
       return 0;                                                  \
     }                                                            \
diff --git a/calendar/libecal/e-cal-view.c b/calendar/libecal/e-cal-view.c
index b17e51a..5e8302f 100644
--- a/calendar/libecal/e-cal-view.c
+++ b/calendar/libecal/e-cal-view.c
@@ -416,7 +416,7 @@ e_cal_view_start (ECalView *view)
 	LOCK_VIEW ();
 	if (!org_gnome_evolution_dataserver_calendar_CalView_start (priv->view_proxy, &error)) {
 		UNLOCK_VIEW ();
-		g_printerr("%s: %s\n", __FUNCTION__, error->message);
+		g_printerr("%s: %s\n", G_STRFUNC, error->message);
 		g_error_free (error);
 		g_warning (G_STRLOC ": Unable to start view");
 		return;