[darcs-to-svn @ Only one presence per contact]

[empathy.git] / libempathy / empathy-contact-list.c

diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index 5775ca750abbc045aa18456eff1ac3e4a81a3b38..02d0c174d0f7e209a00da8da3bb6131a94cd3825 100644 (file)
--- 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