evolution-exchange r1560 - in trunk: . addressbook camel

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Feb 13 01:47:21 2008
New Revision: 1560
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1560&view=rev

Log:
2008-02-12  Matthew Barnes  <mbarnes redhat com>

	* camel/camel-exchange-summary.c:
	* addressbook/e-book-backend-gal.c:
	Replace G_GNUC_PRETTY_FUNCTION (deprecated) with G_STRFUNC.



Modified:
   trunk/ChangeLog
   trunk/addressbook/e-book-backend-gal.c
   trunk/camel/camel-exchange-summary.c

Modified: trunk/addressbook/e-book-backend-gal.c
==============================================================================
--- trunk/addressbook/e-book-backend-gal.c	(original)
+++ trunk/addressbook/e-book-backend-gal.c	Wed Feb 13 01:47:21 2008
@@ -1575,9 +1575,9 @@
 	int msg_type;
 
 	d(printf ("ldap_search_handler (%p)\n", view));
-	printf("%s(%d):%s: search handler \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+	printf("%s:%s: search handler \n", G_STRLOC, G_STRFUNC);
 	if (!ldap) {
-		printf("%s(%d):%s: other error\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+		printf("%s:%s: other error\n", G_STRLOC, G_STRFUNC);
 		e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_OtherError);
 		ldap_op_finished (op);
 		return;
@@ -1615,7 +1615,7 @@
 				   NULL, &ldap_error_msg, NULL, NULL, 0);
 		g_mutex_unlock (bl->priv->ldap_lock);
 		if (ldap_error != LDAP_SUCCESS) {
-			printf("%s(%d):%s: error result\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+			printf("%s:%s: error result\n", G_STRLOC, G_STRFUNC);
 			g_warning ("ldap_search_handler: %02X (%s), additional info: %s",
 				   ldap_error,
 				   ldap_err2string (ldap_error), ldap_error_msg);
@@ -1630,7 +1630,7 @@
 			e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_Success);
 		else
 			e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_OtherError);
-		printf("%s(%d):%s: o/p %d %d\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION, ldap_error, LDAP_SUCCESS);
+		printf("%s:%s: o/p %d %d\n", G_STRLOC, G_STRFUNC, ldap_error, LDAP_SUCCESS);
 		ldap_op_finished (op);
 	}
 	else {
@@ -1770,7 +1770,7 @@
 			printf("Not marked for offline or cache not there\n");
 			if (!bl->priv->ldap) {
 				if (!gal_reconnect (bl, view, 0)) {
-					printf("%s(%d):%s: no ldap :(\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+					printf("%s:%s: no ldap :(\n", G_STRLOC, G_STRFUNC);
 					e_data_book_view_notify_complete (view,
 									  GNOME_Evolution_Addressbook_InvalidQuery);
 					return;
@@ -1790,12 +1790,12 @@
 
 			status = build_query (bl, e_data_book_view_get_card_query (view),
 					      &ldap_query);
-			printf("%s(%d):%s: %s\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION, ldap_query);
+			printf("%s:%s: %s\n", G_STRLOC, G_STRFUNC, ldap_query);
 			if (status != GNOME_Evolution_Addressbook_Success || !ldap_query) {
 				e_data_book_view_notify_complete (view, status);
 				if (ldap_query)
 					g_free (ldap_query);
-				printf("%s(%d):%s: failure \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+				printf("%s:%s: failure \n", G_STRLOC, G_STRFUNC);
 				return;
 			}
 
@@ -1804,7 +1804,7 @@
 					book_view_notify_status (view, _("Searching..."));
 
 					g_mutex_lock (bl->priv->ldap_lock);
-					printf("%s(%d):%s: starting \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+					printf("%s:%s: starting \n", G_STRLOC, G_STRFUNC);
 					ldap_err = ldap_search_ext (bl->priv->ldap, LDAP_ROOT_DSE,
 								    LDAP_SCOPE_SUBTREE,
 								    ldap_query,
@@ -1815,7 +1815,7 @@
 								    view_limit,
 								    &search_msgid);
 					g_mutex_unlock (bl->priv->ldap_lock);
-					printf("%s(%d):%s: %d\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION, ldap_err);
+					printf("%s:%s: %d\n", G_STRLOC, G_STRFUNC, ldap_err);
 				} else
 					bl->priv->connected = FALSE;
 			} while (gal_reconnect (bl, view, ldap_err));
@@ -1823,12 +1823,12 @@
 			g_free (ldap_query);
 
 			if (ldap_err != LDAP_SUCCESS) {
-				printf("%s(%d):%s: error\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+				printf("%s:%s: error\n", G_STRLOC, G_STRFUNC);
 				book_view_notify_status (view, ldap_err2string(ldap_err));
 				return;
 			}
 			else if (search_msgid == -1) {
-				printf("%s(%d):%s: error\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+				printf("%s:%s: error\n", G_STRLOC, G_STRFUNC);
 				book_view_notify_status (view,
 							 _("Error performing search"));
 				return;
@@ -1837,7 +1837,7 @@
 				LDAPSearchOp *op = g_new0 (LDAPSearchOp, 1);
 
 				d(printf ("adding search_op (%p, %d)\n", view, search_msgid));
-				printf("%s(%d):%s: adding search \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+				printf("%s:%s: adding search \n", G_STRLOC, G_STRFUNC);
 				op->view = view;
 				op->aborted = FALSE;
 
@@ -2208,7 +2208,7 @@
 		if (!exchange_account_get_context (account)) {
 			exchange_account_set_online (account);
 			if(!exchange_account_connect (account, password, &result)) {
-				printf("%s(%d):%s: failed\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+				printf("%s:%s: failed\n", G_STRLOC, G_STRFUNC);
 				e_data_book_respond_authenticate_user (book, opid, GNOME_Evolution_Addressbook_AuthenticationFailed);
 				return;
 			}
@@ -2378,7 +2378,7 @@
 			    guint32       opid)
 
 {
-	printf("%s(%d):%s: NONE\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+	printf("%s:%s: NONE\n", G_STRLOC, G_STRFUNC);
 	e_data_book_respond_get_supported_auth_methods (book,
 							opid,
 							GNOME_Evolution_Addressbook_Success,

Modified: trunk/camel/camel-exchange-summary.c
==============================================================================
--- trunk/camel/camel-exchange-summary.c	(original)
+++ trunk/camel/camel-exchange-summary.c	Wed Feb 13 01:47:21 2008
@@ -161,7 +161,7 @@
 	exchange->version = version;
 
 
-	d(g_print ("%s:%s:%d: high_article_num = [%d]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, high_article_num));
+	d(g_print ("%s:%s: high_article_num = [%d]\n", G_STRLOC, G_STRFUNC, high_article_num));
 
 	return 0;
 }
@@ -183,7 +183,7 @@
 	if (camel_file_util_encode_uint32 (out, exchange->high_article_num) == -1)
 		return -1;
 
-	d(g_print ("%s:%s:%d: high_article_num = [%d]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, exchange->high_article_num));
+	d(g_print ("%s:%s: high_article_num = [%d]\n", G_STRLOC, G_STRFUNC, exchange->high_article_num));
 
 	return 0;
 }
@@ -216,7 +216,7 @@
 		}
 
 		einfo->href = href;
-		d(g_print ("%s:%s:%d: einfo->href = [%s]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, einfo->href));
+		d(g_print ("%s:%s: einfo->href = [%s]\n", G_STRLOC, G_STRFUNC, einfo->href));
 	}
 
 	return info;
@@ -239,7 +239,7 @@
 	if (camel_file_util_encode_string (out, einfo->href ? einfo->href : "") == -1)
 		return -1;
 
-	d(g_print ("%s:%s:%d: einfo->href = [%s]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, einfo->href));
+	d(g_print ("%s:%s: einfo->href = [%s]\n", G_STRLOC, G_STRFUNC, einfo->href));
 
 	return 0;
 }