aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-contact-list.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2007-04-27 22:02:59 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-04-27 22:02:59 +0800
commit3e0960a8f543917145421d44a208177289028121 (patch)
tree0ffc15c04b43ffd52ac7a06b8e465437d520e59b /libempathy/empathy-contact-list.c
parenta6dd26148d5cd05475d27ab26c395e60beb797b2 (diff)
downloadgsoc2013-empathy-3e0960a8f543917145421d44a208177289028121.tar
gsoc2013-empathy-3e0960a8f543917145421d44a208177289028121.tar.gz
gsoc2013-empathy-3e0960a8f543917145421d44a208177289028121.tar.bz2
gsoc2013-empathy-3e0960a8f543917145421d44a208177289028121.tar.lz
gsoc2013-empathy-3e0960a8f543917145421d44a208177289028121.tar.xz
gsoc2013-empathy-3e0960a8f543917145421d44a208177289028121.tar.zst
gsoc2013-empathy-3e0960a8f543917145421d44a208177289028121.zip
[darcs-to-svn @ Only one presence per contact]
svn path=/trunk/; revision=9
Diffstat (limited to 'libempathy/empathy-contact-list.c')
-rw-r--r--libempathy/empathy-contact-list.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index 5775ca750..02d0c174d 100644
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -1732,12 +1732,7 @@ contact_list_parse_presence_foreach (guint handle,
handle);
contact_list_block_contact (list, contact);
- if (presence) {
- gossip_contact_add_presence (contact, presence);
- g_object_unref (presence);
- } else {
- g_object_set (contact, "presences", NULL, NULL);
- }
+ gossip_contact_set_presence (contact, presence);
contact_list_unblock_contact (list, contact);
}
@@ -1767,8 +1762,6 @@ contact_list_presences_table_foreach (const gchar *state_str,
gossip_presence_set_status (*presence,
g_value_get_string (message));
}
-
- gossip_presence_set_resource (*presence, "");
}
static GossipPresenceState