[Galago-commits] r2566 - in branches/libgalago/protocol-cleanup: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-02-07 01:58:05 -0800 (Tue, 07 Feb 2006)
New Revision: 2566

Modified:
   branches/libgalago/protocol-cleanup/ChangeLog
   branches/libgalago/protocol-cleanup/libgalago/galago-core.c
Log:
Remove some asserts that were preventing re-registration from working. It's still buggy, but works better now.


Modified: branches/libgalago/protocol-cleanup/ChangeLog
===================================================================
--- branches/libgalago/protocol-cleanup/ChangeLog	2006-02-07 09:38:37 UTC (rev 2565)
+++ branches/libgalago/protocol-cleanup/ChangeLog	2006-02-07 09:58:05 UTC (rev 2566)
@@ -1,3 +1,9 @@
+Tue Feb 07 01:57:41 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	  - Remove some asserts that were preventing re-registration from
+	    working. It's still buggy, but works better now.
+
 Tue Feb 07 01:37:12 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-core.c:

Modified: branches/libgalago/protocol-cleanup/libgalago/galago-core.c
===================================================================
--- branches/libgalago/protocol-cleanup/libgalago/galago-core.c	2006-02-07 09:38:37 UTC (rev 2565)
+++ branches/libgalago/protocol-cleanup/libgalago/galago-core.c	2006-02-07 09:58:05 UTC (rev 2566)
@@ -1309,8 +1309,6 @@
 		return;
 	}
 
-	g_assert(galago_object_get_dbus_path(GALAGO_OBJECT(service)) == NULL);
-
 	dbus_conn = galago_get_dbus_conn();
 
 	message = dbus_message_new_method_call(GALAGO_DBUS_SERVICE,
@@ -1385,16 +1383,12 @@
 
 	g_signal_emit(_core, signals[PERSON_ADDED], 0, person);
 
-	printf("Attempting to call AddPerson %p (%s)\n", person,
-		   galago_person_get_id(person));
 	if (!galago_is_connected() || !galago_is_feed() ||
 		GALAGO_OBJECT_IS_REMOTE(person))
 	{
 		return;
 	}
 
-	g_assert(galago_object_get_dbus_path(GALAGO_OBJECT(person)) == NULL);
-
 	dbus_conn = galago_get_dbus_conn();
 
 	message = dbus_message_new_method_call(GALAGO_DBUS_SERVICE,
@@ -1407,7 +1401,6 @@
 	dbus_message_iter_init_append(message, &iter);
 	galago_dbus_message_iter_append_object(&iter, GALAGO_OBJECT(person));
 
-	printf("Called AddPerson\n");
 	dbus_error_init(&error);
 	reply = dbus_connection_send_with_reply_and_block(dbus_conn, message, -1,
 													  &error);