[Galago-commits] r2559 - in branches/galago-daemon/protocol-cleanup: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-02-06 00:15:20 -0800 (Mon, 06 Feb 2006)
New Revision: 2559

Modified:
   branches/galago-daemon/protocol-cleanup/ChangeLog
   branches/galago-daemon/protocol-cleanup/src/account.c
   branches/galago-daemon/protocol-cleanup/src/meta-person.c
Log:
Fix the retrieval of the MetaPresence when creating a presence.


Modified: branches/galago-daemon/protocol-cleanup/ChangeLog
===================================================================
--- branches/galago-daemon/protocol-cleanup/ChangeLog	2006-02-05 04:34:22 UTC (rev 2558)
+++ branches/galago-daemon/protocol-cleanup/ChangeLog	2006-02-06 08:15:20 UTC (rev 2559)
@@ -1,3 +1,9 @@
+Mon Feb 06 00:14:20 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/account.c:
+	* src/meta-person.c:
+	  - Fix the retrieval of the MetaPresence when creating a presence.
+
 Fri Feb 03 02:16:32 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/account.c:

Modified: branches/galago-daemon/protocol-cleanup/src/account.c
===================================================================
--- branches/galago-daemon/protocol-cleanup/src/account.c	2006-02-05 04:34:22 UTC (rev 2558)
+++ branches/galago-daemon/protocol-cleanup/src/account.c	2006-02-06 08:15:20 UTC (rev 2559)
@@ -325,6 +325,9 @@
 
 	presence = galago_account_get_presence(account, FALSE);
 
+	if (main_presence != NULL)
+		meta_presence = GALAGOD_META_PRESENCE(main_presence);
+
 	if (presence == NULL)
 	{
 		char *new_obj_path;
@@ -337,10 +340,6 @@
 
 		new_presence = TRUE;
 	}
-	else
-	{
-		meta_presence = GALAGOD_META_PRESENCE(main_presence);
-	}
 
 	if (meta_presence == NULL)
 	{

Modified: branches/galago-daemon/protocol-cleanup/src/meta-person.c
===================================================================
--- branches/galago-daemon/protocol-cleanup/src/meta-person.c	2006-02-05 04:34:22 UTC (rev 2558)
+++ branches/galago-daemon/protocol-cleanup/src/meta-person.c	2006-02-06 08:15:20 UTC (rev 2559)
@@ -27,6 +27,10 @@
 #include <time.h>
 #include <unistd.h>
 
+/* Provided by libgalago */
+void _galago_account_set_person(GalagoAccount *account,
+								GalagoPerson *person);
+
 static const char *
 galagod_get_uid(void)
 {