Changeset 2565
- Timestamp:
- 02/07/06 01:38:37
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libgalago/protocol-cleanup/ChangeLog
r2564 r2565 1 Tue Feb 07 01:37:12 PST 2006 Christian Hammond <chipx86@chipx86.com> 2 3 * libgalago/galago-core.c: 4 * libgalago/galago-service.c: 5 - Pass the correct values to galago_get_people() and 6 galago_get_services(). This is another case of passing TRUE/FALSE 7 when an enum value should have been passed. 8 1 9 Tue Feb 07 01:04:02 PST 2006 Christian Hammond <chipx86@chipx86.com> 2 10 branches/libgalago/protocol-cleanup/libgalago/galago-core.c
r2560 r2565 289 289 return; 290 290 291 for (l = galago_get_people( TRUE, FALSE); l != NULL; l = l->next)292 { 293 GalagoPerson *person = (GalagoPerson *)l->data;291 for (l = galago_get_people(GALAGO_LOCAL, FALSE); l != NULL; l = l->next) 292 { 293 GalagoPerson *person = GALAGO_PERSON(l->data); 294 294 295 295 _galago_dbus_core_add_person(person); … … 297 297 } 298 298 299 for (l = galago_get_services( TRUE, FALSE); l != NULL; l = l->next)300 { 301 GalagoService *service = (GalagoService *)l->data;299 for (l = galago_get_services(GALAGO_LOCAL, FALSE); l != NULL; l = l->next) 300 { 301 GalagoService *service = GALAGO_SERVICE(l->data); 302 302 303 303 _galago_dbus_core_add_service(service); … … 1386 1386 g_signal_emit(_core, signals[PERSON_ADDED], 0, person); 1387 1387 1388 printf("Attempting to call AddPerson %p (%s)\n", person, 1389 galago_person_get_id(person)); 1388 1390 if (!galago_is_connected() || !galago_is_feed() || 1389 1391 GALAGO_OBJECT_IS_REMOTE(person)) … … 1406 1408 galago_dbus_message_iter_append_object(&iter, GALAGO_OBJECT(person)); 1407 1409 1410 printf("Called AddPerson\n"); 1408 1411 dbus_error_init(&error); 1409 1412 reply = dbus_connection_send_with_reply_and_block(dbus_conn, message, -1, branches/libgalago/protocol-cleanup/libgalago/galago-service.c
r2525 r2565 231 231 galago_service_dbus_push_full(GalagoObject *object) 232 232 { 233 GalagoService *service = (GalagoService *)object;233 GalagoService *service = GALAGO_SERVICE(object); 234 234 GalagoAccount *account; 235 235 GList *l; … … 249 249 account = (GalagoAccount *)l->data; 250 250 251 galago_dbus_object_push_full(GALAGO_OBJECT( account));251 galago_dbus_object_push_full(GALAGO_OBJECT(l->data)); 252 252 } 253 253 } … … 653 653 char *obj_path; 654 654 655 g_assert(service != NULL); 656 g_assert(account != NULL); 657 655 658 if (!galago_is_connected() || !galago_is_feed()) 656 659 return;
