diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-03-11 20:22:37 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-03-11 20:22:37 +0800 |
| commit | fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9 (patch) | |
| tree | fa43f89134570a145e721945b72da07d27ac4f3f /libempathy-gtk/empathy-contact-list-store.c | |
| parent | cf327059e269141a38a3aa38f0a37d3c6eb0fbbb (diff) | |
| download | gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.gz gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.bz2 gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.lz gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.xz gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.zst gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.zip | |
Make sure we don't expect contact id and handle to be directly ready. Add some _run_until_ready.
svn path=/trunk/; revision=755
Diffstat (limited to 'libempathy-gtk/empathy-contact-list-store.c')
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-store.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c index 46fa99474..84c7223ff 100644 --- a/libempathy-gtk/empathy-contact-list-store.c +++ b/libempathy-gtk/empathy-contact-list-store.c @@ -880,7 +880,8 @@ contact_list_store_add_contact (EmpathyContactListStore *store, priv = GET_PRIV (store); - if (!priv->show_offline && !empathy_contact_is_online (contact)) { + if (!(empathy_contact_get_ready (contact) & EMPATHY_CONTACT_READY_ID) || + (!priv->show_offline && !empathy_contact_is_online (contact))) { return; } @@ -1488,15 +1489,14 @@ contact_list_store_find_contact_foreach (GtkTreeModel *model, EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact, -1); - if (!contact) { - return FALSE; - } - - if (empathy_contact_equal (contact, fc->contact)) { + if (contact == fc->contact) { fc->found = TRUE; fc->iters = g_list_append (fc->iters, gtk_tree_iter_copy (iter)); } - g_object_unref (contact); + + if (contact) { + g_object_unref (contact); + } return FALSE; } |