aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--libempathy-gtk/gossip-contact-list-store.c6
-rw-r--r--libempathy/empathy-idle.c2
-rw-r--r--libempathy/empathy-tp-contact-list.c4
4 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fe6e428c..568362887 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-26 Xavier Claessens <xclaesse@gmail.com>
+
+ * 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.
+
2007-05-25 Xavier Claessens <xclaesse@gmail.com>
* configure.ac: Bump version to 0.6
@@ -10,7 +19,6 @@
request fails.
* data/22x22/empathy-group-message.png:
* data/22x22/Makefile.am: Add group message icon.
-
2007-05-25 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/gossip-new-chatroom-dialog.c: Do not use the server
diff --git a/libempathy-gtk/gossip-contact-list-store.c b/libempathy-gtk/gossip-contact-list-store.c
index c8a43ed5a..f0ff476dd 100644
--- a/libempathy-gtk/gossip-contact-list-store.c
+++ b/libempathy-gtk/gossip-contact-list-store.c
@@ -320,6 +320,7 @@ gossip_contact_list_store_new (EmpathyContactList *list_iface)
GossipContactListStore *store;
GossipContactListStorePriv *priv;
GList *contacts, *l;
+ gboolean show_active;
g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list_iface), NULL);
@@ -339,7 +340,9 @@ gossip_contact_list_store_new (EmpathyContactList *list_iface)
G_CALLBACK (contact_list_store_contact_removed_cb),
store);
- /* Add contacts already created */
+ /* Add contacts already created. Do not highlight them. */
+ show_active = priv->show_active;
+ priv->show_active = FALSE;
contacts = empathy_contact_list_get_contacts (priv->list);
for (l = contacts; l; l = l->next) {
GossipContact *contact;
@@ -351,6 +354,7 @@ gossip_contact_list_store_new (EmpathyContactList *list_iface)
g_object_unref (contact);
}
g_list_free (contacts);
+ priv->show_active = show_active;
return store;
}
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);