Likewise. Likewise. Likewise. Likewise. Likewise. (ebook_create):

* backend/ebook/load-pine-addressbook.c (ebook_create): Likewise.
* backend/ebook/load-gnomecard-addressbook.c (ebook_create): Likewise.
* backend/ebook/evolution-vcard-importer.c (ebook_create): Likewise.
* backend/ebook/evolution-ldif-importer.c (ebook_create): Likewise.
* backend/ebook/test-client.c (get_cursor_cb): Likewise.
(ebook_create): Likewise.
* gui/widgets/e-minicard.c (e_minicard_set_property): Likewise.
(card_modified_cb): Likewise.
(e_minicard_event): Likewise.
* gui/widgets/gal-view-minicard.c (column_width_changed): Likewise.
* gui/widgets/test-minicard-view.c (ebook_create): Likewise.
* gui/widgets/gal-view-treeview.c (column_width_changed): Likewise.

svn path=/trunk/; revision=20203

5 files changed, 6 insertions, 7 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 353f710cf2..c7b0003af6 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -138,7 +138,6 @@ static void
 card_modified_cb (EBook* book, EBookStatus status,
 		  gpointer user_data)
 {
-	/* g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__); */
 	if (status != E_BOOK_STATUS_SUCCESS)
 		e_addressbook_error_dialog (_("Error modifying card"), status);
 }
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 9e02491d4b..822b10041a 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -326,7 +326,7 @@ e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, G
 				      NULL);
 		break;
 	case PROP_HAS_CURSOR:
-		d(g_print("%s: PROP_HAS_CURSOR\n", __FUNCTION__));
+		d(g_print("%s: PROP_HAS_CURSOR\n", G_GNUC_FUNCTION));
 		if (e_minicard->has_cursor != g_value_get_boolean (value))
 			set_has_cursor (e_minicard, g_value_get_boolean (value));
 		break;
@@ -510,7 +510,7 @@ e_minicard_unrealize (GnomeCanvasItem *item)
 static void
 card_modified_cb (EBook* book, EBookStatus status, gpointer user_data)
 {
-	d(g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__));
+	d(g_print ("%s: %s(): a card was modified\n", __FILE__, G_GNUC_FUNCTION));
 	if (status != E_BOOK_STATUS_SUCCESS)
 		e_addressbook_error_dialog (_("Error modifying card"), status);
 }
@@ -537,7 +537,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", __FUNCTION__, focus_event->in?"in":"out"));
+			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_GNUC_FUNCTION, 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 79be641c0a..08818f9ee3 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -180,7 +180,7 @@ gal_view_minicard_get_type        (void)
 static void
 column_width_changed (EMinicardViewWidget *w, double width, GalViewMinicard *view)
 {
-	d(g_print("%s: Old width = %f, New width = %f\n", __FUNCTION__, view->column_width, width));
+	d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width));
 	if (view->column_width != width) {
 		view->column_width = width;
 		gal_view_changed(GAL_VIEW(view));
diff --git a/addressbook/gui/widgets/gal-view-treeview.c b/addressbook/gui/widgets/gal-view-treeview.c
index 8d13d4aa26..f43b3add75 100644
--- a/addressbook/gui/widgets/gal-view-treeview.c
+++ b/addressbook/gui/widgets/gal-view-treeview.c
@@ -182,7 +182,7 @@ gal_view_treeview_get_type        (void)
 static void
 column_width_changed (ETable *table, double width, GalViewMinicard *view)
 {
-	d(g_print("%s: Old width = %f, New width = %f\n", __FUNCTION__, view->column_width, width));
+	d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width));
 	if (view->column_width != width) {
 		view->column_width = width;
 		gal_view_changed(GAL_VIEW(view));
diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c
index 1a4ff8e07f..14ede54208 100644
--- a/addressbook/gui/widgets/test-minicard-view.c
+++ b/addressbook/gui/widgets/test-minicard-view.c
@@ -127,7 +127,7 @@ ebook_create (gpointer data)
 	if (!book) {
 		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
 			__FILE__,
-			__FUNCTION__);
+			G_GNUC_FUNCTION);
 		return FALSE;
 	}