diff options
author | Xavier Claessens <xclaesse@gmail.com> | 2007-06-21 23:19:49 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-06-21 23:19:49 +0800 |
commit | e0617b2fc06f59bfcfbd1f03a4364ba12294e718 (patch) | |
tree | 81603b1efcd16b7aa5e45b47a9c902804d2e439d /libempathy/gossip-contact.c | |
parent | b59ff7a94fab8dd50fae90d0fcc9c03b2de010ac (diff) | |
download | gsoc2013-empathy-e0617b2fc06f59bfcfbd1f03a4364ba12294e718.tar gsoc2013-empathy-e0617b2fc06f59bfcfbd1f03a4364ba12294e718.tar.gz gsoc2013-empathy-e0617b2fc06f59bfcfbd1f03a4364ba12294e718.tar.bz2 gsoc2013-empathy-e0617b2fc06f59bfcfbd1f03a4364ba12294e718.tar.lz gsoc2013-empathy-e0617b2fc06f59bfcfbd1f03a4364ba12294e718.tar.xz gsoc2013-empathy-e0617b2fc06f59bfcfbd1f03a4364ba12294e718.tar.zst gsoc2013-empathy-e0617b2fc06f59bfcfbd1f03a4364ba12294e718.zip |
We show in our roster all contacts members and remote-pending of subscribe
2007-06-21 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-contact-dialogs.c:
* libempathy-gtk/gossip-contact-list-store.c:
* libempathy-gtk/gossip-contact-list-view.c:
* libempathy/empathy-contact-manager.c:
* libempathy/empathy-tp-contact-list.c:
* libempathy/empathy-contact-list.c:
* libempathy/empathy-contact-list.h:
* libempathy/gossip-contact.c: We show in our roster all contacts
members and remote-pending of subscribe list. Adding/Removing a contact
only add/remove from subscribe list. Accept/Reject a contact in
local-pending of publish list is done using _process_pending().
svn path=/trunk/; revision=164
Diffstat (limited to 'libempathy/gossip-contact.c')
-rw-r--r-- | libempathy/gossip-contact.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libempathy/gossip-contact.c b/libempathy/gossip-contact.c index 53fe7e182..ba97fa758 100644 --- a/libempathy/gossip-contact.c +++ b/libempathy/gossip-contact.c @@ -373,7 +373,7 @@ gossip_contact_get_name (GossipContact *contact) priv = GET_PRIV (contact); - if (priv->name == NULL) { + if (G_STR_EMPTY (priv->name)) { return gossip_contact_get_id (contact); } @@ -710,7 +710,11 @@ gossip_contact_is_online (GossipContact *contact) priv = GET_PRIV (contact); - return (priv->presence != NULL); + if (!priv->presence) { + return FALSE; + } + + return (gossip_presence_get_state (priv->presence) > MC_PRESENCE_OFFLINE); } gboolean |