Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.

2008-01-29  Matthew Barnes  <mbarnes@redhat.com>

	* addressbook/gui/widgets/e-minicard.c:
	* addressbook/gui/widgets/gal-view-minicard.c:
	* mail/mail-send-recv.c:
	* shell/e-component-registry.c:
	* widgets/menus/gal-view-collection.c:
	* widgets/menus/gal-view-instance.c:
	* widgets/menus/gal-view-menus.c:
	Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.


svn path=/trunk/; revision=34931

12 files changed, 35 insertions, 12 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c4fc2d714c..c94af5f428 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-29  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/widgets/e-minicard.c:
+	* gui/widgets/gal-view-minicard.c:
+	Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.
+
 2008-01-25  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #512020
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 700a4f78a8..cf1dc03476 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -347,7 +347,7 @@ e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, G
 		}
 		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, GdkEvent *event)
 	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 --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index cf0833d1fe..764c0edfe0 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -192,7 +192,7 @@ column_width_changed (EMinicardViewWidget *w, double width, EABView *address_vie
 	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 --git a/mail/ChangeLog b/mail/ChangeLog
index cbf33205c9..37f91f43c4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-29  Matthew Barnes  <mbarnes@redhat.com>
+
+	* mail-send-recv.c:
+	Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.
+
 2008-01-28  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #506948
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 6cead72700..5c4454d7cb 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -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 --git a/shell/ChangeLog b/shell/ChangeLog
index 4b10059506..52dce6694e 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-29  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-component-registry.c:
+	Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.
+
 2008-01-22  Jan Tichavsky  <Jan.Tichavsky@gmail.com>
 
 	** Fix for bug #511232
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 9d953b4997..eb11adb081 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -343,7 +343,7 @@ e_component_registry_activate (EComponentRegistry *registry,
 
 	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 --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 23223614ec..48c480227b 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -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
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index f50334fae3..bfe60097f6 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-29  Matthew Barnes  <mbarnes@redhat.com>
+
+	* menus/gal-view-collection.c:
+	* menus/gal-view-menus.c:
+	* menus/gal-view-instance.c:
+	Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.
+
 2008-01-14  Mayank Jain  <mayank.gnu@gmail.com>
 
 	** Fix for bug #348638
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index f286ee445d..a9a1ce7f22 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -753,7 +753,7 @@ gal_view_collection_append_with_title (GalViewCollection *collection, const char
 
 	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 (GalViewCollection *collection, int i, GalView
 	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 --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index fbdcf608cc..014ad424b1 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -375,7 +375,7 @@ gal_view_instance_set_current_view_id (GalViewInstance *instance, const char *vi
 	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 --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index d2b9929a2a..f65a76ca51 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -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);
 	}
 }