diff options
| -rw-r--r-- | libempathy/empathy-contact.c | 3 | ||||
| -rw-r--r-- | tests/contact-run-until-ready.c | 18 |
2 files changed, 12 insertions, 9 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 1e4aca651..893fabb5a 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -760,7 +760,7 @@ contact_ready_notify_cb (EmpathyContact *contact, EmpathyContactPriv *priv = GET_PRIV (contact); if ((priv->ready & data->ready) == data->ready) { - empathy_debug (DEBUG_DOMAIN, "contact %s (%d) ready %d!", + empathy_debug (DEBUG_DOMAIN, "contact %s (%d) ready %d", priv->id, priv->handle, priv->ready); g_main_loop_quit (data->loop); } @@ -784,6 +784,7 @@ empathy_contact_run_until_ready (EmpathyContact *contact, empathy_debug (DEBUG_DOMAIN, "Run until ready=%d for contact %s (%d)", ready, priv->id, priv->handle); + data.ready = ready; data.loop = g_main_loop_new (NULL, FALSE); signal_id = g_signal_connect (contact, "notify::ready", diff --git a/tests/contact-run-until-ready.c b/tests/contact-run-until-ready.c index ee7a692fb..50011bbc4 100644 --- a/tests/contact-run-until-ready.c +++ b/tests/contact-run-until-ready.c @@ -10,6 +10,7 @@ main (int argc, char **argv) EmpathyContactFactory *factory; McAccount *account; EmpathyContact *contact; + EmpathyContactReady ready_flags; g_type_init (); @@ -18,17 +19,18 @@ main (int argc, char **argv) contact = empathy_contact_factory_get_from_id (factory, account, "testman@jabber.belnet.be"); - g_print ("Contact handle=%d\n", empathy_contact_get_handle (contact)); - - empathy_contact_run_until_ready (contact, - EMPATHY_CONTACT_READY_HANDLE | - EMPATHY_CONTACT_READY_NAME, - NULL); - - g_print ("Contact ready: handle=%d alias=%s\n", + g_print ("Contact handle=%d alias=%s\n", empathy_contact_get_handle (contact), empathy_contact_get_name (contact)); + ready_flags = EMPATHY_CONTACT_READY_HANDLE | EMPATHY_CONTACT_READY_NAME; + empathy_contact_run_until_ready (contact, ready_flags, NULL); + + g_print ("Contact ready: handle=%d alias=%s ready=%d needed-ready=%d\n", + empathy_contact_get_handle (contact), + empathy_contact_get_name (contact), + empathy_contact_get_ready (contact), + ready_flags); g_object_unref (factory); g_object_unref (account); |