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

galago-commits at freedesktop.org galago-commits at freedesktop.org
Tue Jun 13 23:56:59 PDT 2006


Author: chipx86
Date: 2006-06-13 23:56:56 -0700 (Tue, 13 Jun 2006)
New Revision: 2848

Modified:
   trunk/galago-daemon/ChangeLog
   trunk/galago-daemon/src/coco.c
   trunk/galago-daemon/src/galagod.c
   trunk/galago-daemon/src/person-list.c
Log:
Fix some issues when shutting down the guest. We may not be properly removing all instances of the objects still, but they'll be gone at exit anyway :) At least now we're not getting assertion errors.


Modified: trunk/galago-daemon/ChangeLog
===================================================================
--- trunk/galago-daemon/ChangeLog	2006-06-14 06:38:26 UTC (rev 2847)
+++ trunk/galago-daemon/ChangeLog	2006-06-14 06:56:56 UTC (rev 2848)
@@ -1,3 +1,12 @@
+Tue Jun 13 23:55:32 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/coco.c:
+	* src/galagod.c:
+	* src/person-list.c:
+	  - Fix some issues when shutting down the guest. We may not be properly
+	    removing all instances of the objects still, but they'll be gone at
+	    exit anyway :) At least now we're not getting assertion errors.
+
 Tue Jun 13 23:36:32 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/account-list.c:

Modified: trunk/galago-daemon/src/coco.c
===================================================================
--- trunk/galago-daemon/src/coco.c	2006-06-14 06:38:26 UTC (rev 2847)
+++ trunk/galago-daemon/src/coco.c	2006-06-14 06:56:56 UTC (rev 2848)
@@ -78,8 +78,7 @@
 	g_hash_table_remove(_cocos,    obj_path);
 	g_hash_table_remove(_coco_ids, coco->priv->dbus_service_id);
 
-	dbus_connection_unregister_object_path(galago_get_dbus_conn(),
-										   obj_path);
+	dbus_connection_unregister_object_path(galago_get_dbus_conn(), obj_path);
 
 	galagod_people_remove_with_coco(coco);
 	galagod_services_remove_with_coco(coco);

Modified: trunk/galago-daemon/src/galagod.c
===================================================================
--- trunk/galago-daemon/src/galagod.c	2006-06-14 06:38:26 UTC (rev 2847)
+++ trunk/galago-daemon/src/galagod.c	2006-06-14 06:56:56 UTC (rev 2848)
@@ -173,9 +173,9 @@
 void
 galagod_uninit(void)
 {
+	galagod_cocos_uninit();
 	galagod_people_uninit();
 	galagod_services_uninit();
-	galagod_cocos_uninit();
 
 	galago_context_pop();
 }

Modified: trunk/galago-daemon/src/person-list.c
===================================================================
--- trunk/galago-daemon/src/person-list.c	2006-06-14 06:38:26 UTC (rev 2847)
+++ trunk/galago-daemon/src/person-list.c	2006-06-14 06:56:56 UTC (rev 2848)
@@ -256,14 +256,14 @@
 void
 galagod_people_uninit(void)
 {
+	galagod_meta_person_destroy(meta_me);
+	meta_me = NULL;
+
+	meta_person_count = 0;
+
 	g_hash_table_destroy(meta_people_table);
 	meta_people_table = NULL;
 
 	g_list_free(meta_people);
 	meta_people = NULL;
-
-	galagod_meta_person_destroy(meta_me);
-	meta_me = NULL;
-
-	meta_person_count = 0;
 }



More information about the galago-commits mailing list