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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-03-31 11:51:49 -0800 (Fri, 31 Mar 2006)
New Revision: 2645

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-core.c
Log:
Fixed a deadlock when threading is enabled. Patch by Jorn Baayen, with an additional change by me. We're no longer setting _core to the core object in two separate places.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-03-31 02:44:21 UTC (rev 2644)
+++ trunk/libgalago/ChangeLog	2006-03-31 19:51:49 UTC (rev 2645)
@@ -1,3 +1,10 @@
+Fri Mar 31 11:51:03 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	  - Fixed a deadlock when threading is enabled. Patch by
+	    Jorn Baayen, with an additional change by me. We're no longer
+	    setting _core to the core object in two separate places.
+
 Thu Mar 30 18:44:01 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-core.c:

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-03-31 02:44:21 UTC (rev 2644)
+++ trunk/libgalago/libgalago/galago-core.c	2006-03-31 19:51:49 UTC (rev 2645)
@@ -234,12 +234,6 @@
 static void
 galago_core_init(GalagoCore *core)
 {
-	G_LOCK(_core_lock);
-
-	_core = core;
-	galago_object_set_dbus_path(GALAGO_OBJECT(core), GALAGO_DBUS_CORE_OBJECT);
-
-	G_UNLOCK(_core_lock);
 }
 
 static void
@@ -875,6 +869,7 @@
 	_core = g_object_new(GALAGO_TYPE_CORE, NULL);
 	G_UNLOCK(_core_lock);
 
+	galago_object_set_dbus_path(GALAGO_OBJECT(_core), GALAGO_DBUS_CORE_OBJECT);
 	_core->app_name = g_strdup(name);
 	_core->feed = feed;