Use G_GNUC_FUNCTION instead of __FUNCTION__. (OUT): Likewise. Likewise.

* importers/evolution-mbox-importer.c (IN): Use G_GNUC_FUNCTION
instead of __FUNCTION__.
(OUT): Likewise.
* importers/netscape-importer.c (netscape_import_file): Likewise.
* mail-send-recv.c (receive_done): Likewise.
* mail-summary.c (SUMMARY_OUT): Likewise.
(SUMMARY_IN): Likewise.
(folder_changed_cb): Likewise.
(message_changed_cb): Likewise.

svn path=/trunk/; revision=20202

5 files changed, 20 insertions, 8 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7d7275e418..af55d9e28b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,15 @@
+2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
+
+	* importers/evolution-mbox-importer.c (IN): Use G_GNUC_FUNCTION
+	instead of __FUNCTION__.
+	(OUT): Likewise.
+	* importers/netscape-importer.c (netscape_import_file): Likewise.
+	* mail-send-recv.c (receive_done): Likewise.
+	* mail-summary.c (SUMMARY_OUT): Likewise.
+	(SUMMARY_IN): Likewise.
+	(folder_changed_cb): Likewise.
+	(message_changed_cb): Likewise.
+
 2003-03-06  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* folder-browser-factory.c: #include <string.h>
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index f7fedee526..31d3d4c6a2 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -48,8 +48,8 @@
 
 /*  #define IMPORTER_DEBUG */
 #ifdef IMPORTER_DEBUG
-#define IN g_print ("=====> %s (%d)\n", __FUNCTION__, __LINE__)
-#define OUT g_print ("<==== %s (%d)\n", __FUNCTION__, __LINE__)
+#define IN g_print ("=====> %s (%d)\n", G_GNUC_FUNCTION, __LINE__)
+#define OUT g_print ("<==== %s (%d)\n", G_GNUC_FUNCTION, __LINE__)
 #else
 #define IN
 #define OUT
diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c
index 85f8e132f8..b08c1f7e00 100644
--- a/mail/importers/netscape-importer.c
+++ b/mail/importers/netscape-importer.c
@@ -1809,7 +1809,7 @@ netscape_import_file (NsImporter *importer,
 	importer->listener = evolution_importer_listener_new (importer_cb, 
 							      importer);
 	objref = bonobo_object_corba_objref (BONOBO_OBJECT (importer->listener));
-	d(g_print ("%s:Processing...\n", __FUNCTION__));
+	d(g_print ("%s:Processing...\n", G_GNUC_FUNCTION));
 	CORBA_exception_init (&ev);
 	GNOME_Evolution_Importer_processItem (importer->importer, 
 					      objref, &ev);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 64d9118a4a..b64064a8f8 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -574,7 +574,7 @@ receive_done (char *uri, void *data)
 		gtk_widget_set_sensitive((GtkWidget *)info->stop, FALSE);
 
 	/* remove/free this active download */
-	d(printf("%s: freeing info %p\n", __FUNCTION__, info));
+	d(printf("%s: freeing info %p\n", G_GNUC_FUNCTION, info));
 	g_hash_table_remove(info->data->active, info->uri);
 	info->data->infos = g_list_remove(info->data->infos, info);
 
diff --git a/mail/mail-summary.c b/mail/mail-summary.c
index abac927977..978347bb43 100644
--- a/mail/mail-summary.c
+++ b/mail/mail-summary.c
@@ -67,8 +67,8 @@ typedef struct {
 	gboolean in_summary;
 } MailSummary;
 
-#define SUMMARY_IN() g_print ("IN: %s: %d\n", __FUNCTION__, __LINE__);
-#define SUMMARY_OUT() g_print ("OUT: %s: %d\n", __FUNCTION__, __LINE__);
+#define SUMMARY_IN() g_print ("IN: %s: %d\n", G_GNUC_FUNCTION, __LINE__);
+#define SUMMARY_OUT() g_print ("OUT: %s: %d\n", G_GNUC_FUNCTION, __LINE__);
 
 static int queue_len = 0;
 
@@ -247,7 +247,7 @@ folder_changed_cb (CamelObject *folder,
 	summary = (MailSummary *) user_data;
 	fs = g_hash_table_lookup (summary->folder_to_summary, folder);
 	if (fs == NULL) {
-		g_warning ("%s: Unknown folder", __FUNCTION__);
+		g_warning ("%s: Unknown folder", G_GNUC_FUNCTION);
 		return;
 	}
 
@@ -271,7 +271,7 @@ message_changed_cb (CamelObject *folder,
 	summary = (MailSummary *)user_data;
 	fs = g_hash_table_lookup (summary->folder_to_summary, folder);
 	if (fs == NULL) {
-		g_warning ("%s: Unknown folder.", __FUNCTION__);
+		g_warning ("%s: Unknown folder.", G_GNUC_FUNCTION);
 		return;
 	}