[Galago-commits] r2871 - in branches/libgalago/push-presence: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-06-29 01:38:16 -0700 (Thu, 29 Jun 2006)
New Revision: 2871

Modified:
   branches/libgalago/push-presence/ChangeLog
   branches/libgalago/push-presence/libgalago/galago-account.c
Log:
Re-implemented the status setting in galago_account_set_connected().


Modified: branches/libgalago/push-presence/ChangeLog
===================================================================
--- branches/libgalago/push-presence/ChangeLog	2006-06-29 08:36:20 UTC (rev 2870)
+++ branches/libgalago/push-presence/ChangeLog	2006-06-29 08:38:16 UTC (rev 2871)
@@ -1,3 +1,8 @@
+Thu Jun 29 01:37:48 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-account.c:
+	  - Re-implemented the status setting in galago_account_set_connected().
+
 Thu Jun 29 01:35:51 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-service.c:

Modified: branches/libgalago/push-presence/libgalago/galago-account.c
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-account.c	2006-06-29 08:36:20 UTC (rev 2870)
+++ branches/libgalago/push-presence/libgalago/galago-account.c	2006-06-29 08:38:16 UTC (rev 2871)
@@ -607,31 +607,15 @@
 	{
 		galago_context_push(galago_object_get_context(GALAGO_OBJECT(presence)));
 
-		g_assert_not_reached(); // XXX
-
-#if 0
 		if (connected)
 		{
-			if (galago_presence_has_status(presence, "offline") ||
-				galago_presence_get_active_status(presence) == NULL)
-			{
-				galago_presence_add_status(presence,
-					galago_status_new(GALAGO_STATUS_AVAILABLE, "available",
-									  "Available", TRUE));
-			}
+			galago_presence_enable_status(presence, "available", NULL, NULL);
 		}
 		else
 		{
 			galago_presence_set_idle(presence, FALSE, 0);
-
-			if (!galago_presence_has_status(presence, "offline"))
-			{
-				galago_presence_add_status(presence,
-					galago_status_new(GALAGO_STATUS_OFFLINE, "offline",
-									  "Offline", TRUE));
-			}
+			galago_presence_enable_status(presence, "offline", NULL, NULL);
 		}
-#endif
 
 		galago_context_pop();
 	}