[Galago-commits] r2348 - in trunk/eds-feed: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-11-27 21:06:40 -0800 (Sun, 27 Nov 2005)
New Revision: 2348

Modified:
   trunk/eds-feed/ChangeLog
   trunk/eds-feed/src/Makefile.am
   trunk/eds-feed/src/main.c
Log:
Use the glib logging functions instead of galago_log_*.


Modified: trunk/eds-feed/ChangeLog
===================================================================
--- trunk/eds-feed/ChangeLog	2005-11-28 05:04:44 UTC (rev 2347)
+++ trunk/eds-feed/ChangeLog	2005-11-28 05:06:40 UTC (rev 2348)
@@ -1,3 +1,9 @@
+Sun Nov 27 21:06:14 PST 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/main.c:
+	* src/Makefile.am:
+	  - Use the glib logging functions instead of galago_log_*.
+
 Sat Nov 12 16:27:50 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/main.c:

Modified: trunk/eds-feed/src/Makefile.am
===================================================================
--- trunk/eds-feed/src/Makefile.am	2005-11-28 05:04:44 UTC (rev 2347)
+++ trunk/eds-feed/src/Makefile.am	2005-11-28 05:06:40 UTC (rev 2348)
@@ -7,4 +7,6 @@
 
 eds_feed_LDADD = $(PACKAGE_LIBS)
 
-INCLUDES = $(PACKAGE_CFLAGS)
+INCLUDES = \
+	-DG_LOG_DOMAIN=\"eds-feed\" \
+	$(PACKAGE_CFLAGS)

Modified: trunk/eds-feed/src/main.c
===================================================================
--- trunk/eds-feed/src/main.c	2005-11-28 05:04:44 UTC (rev 2347)
+++ trunk/eds-feed/src/main.c	2005-11-28 05:06:40 UTC (rev 2348)
@@ -52,8 +52,8 @@
 
 		username = e_vcard_attribute_get_value(attr);
 
-		galago_log(GALAGO_LOG_INFO, "Adding account %s on %s\n",
-				   username, galago_service_get_id(service));
+		g_message("Adding account %s on %s",
+				  username, galago_service_get_id(service));
 
 		account = galago_service_create_account(service, person, username);
 	}
@@ -77,8 +77,8 @@
 
 		if (galago_person_get_account(person, service, username, FALSE))
 		{
-			galago_log(GALAGO_LOG_INFO, "Adding account %s on %s\n",
-					   username, galago_service_get_id(service));
+			g_message("Adding account %s on %s",
+					  username, galago_service_get_id(service));
 
 			account = galago_service_create_account(service, person, username);
 		}
@@ -115,9 +115,9 @@
 
 		if (!found)
 		{
-			galago_log(GALAGO_LOG_INFO, "Removing account %s on %s\n",
-					   galago_account_get_username(account),
-					   galago_service_get_id(service));
+			g_message("Removing account %s on %s",
+					  galago_account_get_username(account),
+					  galago_service_get_id(service));
 			g_object_unref(account);
 		}
 	}
@@ -226,7 +226,7 @@
 
 	if (status != E_BOOK_ERROR_OK)
 	{
-		fprintf(stderr, "Unable to retrieve book view!\n");
+		g_error("Unable to retrieve book view!");
 		exit(1);
 	}
 
@@ -251,14 +251,14 @@
 
 	if (book == NULL)
 	{
-		fprintf(stderr, "Failed to create local addressbook\n");
+		g_error("Failed to create local addressbook");
 
 		exit(1);
 	}
 
 	if (!e_book_open(book, FALSE, NULL))
 	{
-		fprintf(stderr, "Failed to open local addressbook\n");
+		g_error("Failed to open local addressbook");
 
 		g_object_unref(book);
 
@@ -294,7 +294,7 @@
 
 	if (!galago_init("eds-feed", TRUE))
 	{
-		fprintf(stderr, "Unable to initialize Galago.\n");
+		g_error("Unable to initialize Galago.");
 		exit(1);
 	}
 
@@ -303,7 +303,7 @@
 	if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
 						  CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
 	{
-		fprintf(stderr, "Unable to initialize bonobo.\n");
+		g_error("Unable to initialize bonobo.");
 		exit(1);
 	}