Changeset 2566

Show
Ignore:
Timestamp:
02/07/06 01:58:05
Author:
chipx86
Message:

Remove some asserts that were preventing re-registration from working. It's still buggy, but works better now.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/libgalago/protocol-cleanup/ChangeLog

    r2565 r2566  
     1Tue Feb 07 01:57:41 PST 2006  Christian Hammond <chipx86@chipx86.com> 
     2 
     3    * libgalago/galago-core.c: 
     4      - Remove some asserts that were preventing re-registration from 
     5        working. It's still buggy, but works better now. 
     6 
    17Tue Feb 07 01:37:12 PST 2006  Christian Hammond <chipx86@chipx86.com> 
    28 

  • branches/libgalago/protocol-cleanup/libgalago/galago-core.c

    r2565 r2566  
    13101310    } 
    13111311 
    1312     g_assert(galago_object_get_dbus_path(GALAGO_OBJECT(service)) == NULL); 
    1313  
    13141312    dbus_conn = galago_get_dbus_conn(); 
    13151313 
    …… 
    13861384    g_signal_emit(_core, signals[PERSON_ADDED], 0, person); 
    13871385 
    1388     printf("Attempting to call AddPerson %p (%s)\n", person, 
    1389            galago_person_get_id(person)); 
    13901386    if (!galago_is_connected() || !galago_is_feed() || 
    13911387        GALAGO_OBJECT_IS_REMOTE(person)) 
    …… 
    13931389        return; 
    13941390    } 
    1395  
    1396     g_assert(galago_object_get_dbus_path(GALAGO_OBJECT(person)) == NULL); 
    13971391 
    13981392    dbus_conn = galago_get_dbus_conn(); 
    …… 
    14081402    galago_dbus_message_iter_append_object(&iter, GALAGO_OBJECT(person)); 
    14091403 
    1410     printf("Called AddPerson\n"); 
    14111404    dbus_error_init(&error); 
    14121405    reply = dbus_connection_send_with_reply_and_block(dbus_conn, message, -1,