From a0c9dc2f22f510378063be5a8c872bfe8c92bd10 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sat, 26 May 2007 14:10:47 +0000 Subject: Do not highlight contacts already known when creating the contact list. Do 2007-05-26 Xavier Claessens * libempathy-gtk/gossip-contact-list-store.c: Do not highlight contacts already known when creating the contact list. * libempathy/empathy-tp-contact-list.c: Do not set alias if DBus returns an error. * libempathy/empathy-idle.c: Do not set status message to "Extended autoaway", let user's message unchanged. svn path=/trunk/; revision=99 --- libempathy/empathy-idle.c | 2 +- libempathy/empathy-tp-contact-list.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c index bf8116060..42719a47e 100644 --- a/libempathy/empathy-idle.c +++ b/libempathy/empathy-idle.c @@ -231,7 +231,7 @@ idle_ext_away_cb (EmpathyIdle *idle) gossip_debug (DEBUG_DOMAIN, "Going to extended autoaway"); mission_control_set_presence (priv->mc, MC_PRESENCE_EXTENDED_AWAY, - _("Extended autoaway"), + priv->saved_status, NULL, NULL); priv->ext_away_timeout = 0; diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 8338e9eb4..64bec75ff 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -1719,11 +1719,11 @@ tp_contact_list_request_aliases_cb (DBusGProxy *proxy, error->message); } - for (name = contact_names; *name; name++) { + for (name = contact_names; *name && !error; name++) { GossipContact *contact; contact = empathy_tp_contact_list_get_from_handle (data->list, - data->handles[i]); + data->handles[i]); tp_contact_list_block_contact (data->list, contact); gossip_contact_set_name (contact, *name); tp_contact_list_unblock_contact (data->list, contact); -- cgit v1.2.3