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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-12 00:00:50 -0700 (Wed, 12 Apr 2006)
New Revision: 2709

Modified:
   trunk/eds-feed/ChangeLog
   trunk/eds-feed/src/main.c
Log:
- Attach to the "unregistered" signal and exit the mainloop.
- Don't try to push feed data if we're not registered with Galago.


Modified: trunk/eds-feed/ChangeLog
===================================================================
--- trunk/eds-feed/ChangeLog	2006-04-12 06:48:22 UTC (rev 2708)
+++ trunk/eds-feed/ChangeLog	2006-04-12 07:00:50 UTC (rev 2709)
@@ -1,3 +1,9 @@
+Wed Apr 12 00:00:13 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/main.c:
+	  - Attach to the "unregistered" signal and exit the mainloop.
+	  - Don't try to push feed data if we're not registered with Galago.
+
 Tue Apr 11 23:48:06 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/main.c:

Modified: trunk/eds-feed/src/main.c
===================================================================
--- trunk/eds-feed/src/main.c	2006-04-12 06:48:22 UTC (rev 2708)
+++ trunk/eds-feed/src/main.c	2006-04-12 07:00:50 UTC (rev 2709)
@@ -39,7 +39,7 @@
 
 	im_attr_list = e_contact_get_attributes(contact, field);
 
-        while (im_attr_list)
+	while (im_attr_list != NULL)
 	{
 		EVCardAttribute *attr = (EVCardAttribute *)im_attr_list->data;
 		char *username;
@@ -342,12 +342,19 @@
 
 	if (!galago_init("eds-feed", GALAGO_INIT_FEED))
 	{
-		g_error("Unable to initialize Galago.");
+		g_warning("Unable to initialize Galago.");
 		exit(1);
 	}
 
-	galago_set_exit_with_daemon(TRUE);
+	if (!galago_is_registered())
+	{
+		g_warning("Unable to register with Galago. Exitting.");
+		exit(1);
+	}
 
+	g_signal_connect_swapped(G_OBJECT(galago_get_core()), "unregistered",
+							 G_CALLBACK(g_main_loop_quit), loop);
+
 	setup_book_view();
 	setup_services();