[Galago-commits] r2698 - in trunk/galago-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-10 22:46:00 -0700 (Mon, 10 Apr 2006)
New Revision: 2698

Modified:
   trunk/galago-daemon/ChangeLog
   trunk/galago-daemon/src/account.c
Log:
tch by Jorn Baayen to fix presence notifications to clients. The wrong object path was being reported back to listeners.


Modified: trunk/galago-daemon/ChangeLog
===================================================================
--- trunk/galago-daemon/ChangeLog	2006-04-11 04:33:10 UTC (rev 2697)
+++ trunk/galago-daemon/ChangeLog	2006-04-11 05:46:00 UTC (rev 2698)
@@ -1,3 +1,9 @@
+Mon Apr 10 22:45:19 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/account.c:
+	  - Patch by Jorn Baayen to fix presence notifications to clients.
+	    The wrong object path was being reported back to listeners.
+
 Mon Apr 10 00:28:49 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* Makefile.am:

Modified: trunk/galago-daemon/src/account.c
===================================================================
--- trunk/galago-daemon/src/account.c	2006-04-11 04:33:10 UTC (rev 2697)
+++ trunk/galago-daemon/src/account.c	2006-04-11 05:46:00 UTC (rev 2698)
@@ -357,6 +357,7 @@
 	if (meta_presence == NULL)
 	{
 		meta_presence = galagod_meta_presence_new(meta_account);
+		main_presence = galago_account_get_presence(main_account, FALSE);
 		new_presence = TRUE;
 	}
 
@@ -364,7 +365,7 @@
 	{
 		galagod_meta_presence_add_presence(meta_presence, presence);
 		_galagod_dbus_account_emit_with_object(main_account, "PresenceCreated",
-											   presence);
+											   main_presence);
 	}
 
 	reply = dbus_message_new_method_return(message);