[Galago-commits] r2697 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-10 21:33:10 -0700 (Mon, 10 Apr 2006)
New Revision: 2697

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-core.c
Log:
Patch by Jorn Baayen to prevent re-registration if the app is the owner of the Galago D-BUS service.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-04-10 07:54:19 UTC (rev 2696)
+++ trunk/libgalago/ChangeLog	2006-04-11 04:33:10 UTC (rev 2697)
@@ -1,3 +1,9 @@
+Mon Apr 10 21:30:44 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	  - Patch by Jorn Baayen to prevent re-registration if the app is the
+	    owner of the Galago D-BUS service.
+
 Mon Apr 10 00:53:03 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-context.c:

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-04-10 07:54:19 UTC (rev 2696)
+++ trunk/libgalago/libgalago/galago-core.c	2006-04-11 04:33:10 UTC (rev 2697)
@@ -752,7 +752,11 @@
 
 	_core->priv->filters_added = TRUE;
 
-	_galago_dbus_register_connection();
+	if (dbus_bus_name_has_owner(_core->priv->dbus_conn,
+								GALAGO_DBUS_SERVICE, NULL))
+	{
+		_galago_dbus_register_connection();
+	}
 
 	return TRUE;
 }