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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-03 00:56:38 -0700 (Mon, 03 Apr 2006)
New Revision: 2662

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-context.c
   trunk/libgalago/libgalago/galago-core.c
Log:
Don't disconnect the bus or unref it. It's a shame I have to do this, but for now, it works around bug #36. This needs to be figured out, though, and it's important to find out if this is a D-BUS problem or a Galago problem.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-04-03 00:02:51 UTC (rev 2661)
+++ trunk/libgalago/ChangeLog	2006-04-03 07:56:38 UTC (rev 2662)
@@ -1,3 +1,12 @@
+Mon Apr 03 00:55:06 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-context.c:
+	* libgalago/galago-core.c:
+	  - Don't disconnect the bus or unref it. It's a shame I have to do
+	    this, but for now, it works around bug #36. This needs to be figured
+	    out, though, and it's important to find out if this is a D-BUS
+	    problem or a Galago problem.
+
 Sun Apr 02 16:39:18 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-core.c:

Modified: trunk/libgalago/libgalago/galago-context.c
===================================================================
--- trunk/libgalago/libgalago/galago-context.c	2006-04-03 00:02:51 UTC (rev 2661)
+++ trunk/libgalago/libgalago/galago-context.c	2006-04-03 07:56:38 UTC (rev 2662)
@@ -32,6 +32,7 @@
 
 	GHashTable *services_table;
 	GHashTable *people_table;
+	GHashTable *obj_tree;
 
 	struct
 	{
@@ -46,8 +47,6 @@
 		GList *people;
 
 	} remote;
-
-	GHashTable *obj_tree;
 };
 
 typedef struct

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-04-03 00:02:51 UTC (rev 2661)
+++ trunk/libgalago/libgalago/galago-core.c	2006-04-03 07:56:38 UTC (rev 2662)
@@ -776,9 +776,22 @@
 											  filter_func, NULL);
 			}
 
+			dbus_connection_dispatch(_core->dbus_conn);
+
+			/*
+			 * NOTE: There seems to be a big problem when uninitting and
+			 *       then initting Galago. It has to do with GalagoService,
+			 *       I think, but it's proving extremely difficult to track
+			 *       that down. For now, we're just going to prevent
+			 *       closing and unreffing, as this seems to fix that
+			 *       particular issue.
+			 *
+			 *       See bug #36.
+			 */
+#if 0
 			dbus_connection_close(_core->dbus_conn);
-			dbus_connection_dispatch(_core->dbus_conn);
 			dbus_connection_unref(_core->dbus_conn);
+#endif
 			_core->dbus_conn = NULL;
 		}
 	}
@@ -1270,17 +1283,15 @@
 _galago_dbus_unregister_connection_finish(void)
 {
 	galago_context_clear_objects(GALAGO_REMOTE);
-
 	galago_set_watch_all(FALSE);
 
-	_core->daemon_active = FALSE;
-	_core->registered = FALSE;
+	g_free(_core->uid);
+	g_free(_core->conn_obj_path);
 
-	g_free (_core->uid);
-	g_free (_core->conn_obj_path);
-
 	_core->uid = NULL;
 	_core->conn_obj_path = NULL;
+	_core->daemon_active = FALSE;
+	_core->registered = FALSE;
 
 	g_signal_emit(_core, signals[UNREGISTERED], 0);
 }