aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--data/empathy.schemas.in6
-rw-r--r--libempathy-gtk/gossip-contact-list-store.c6
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e445d8f3e..9ba82b074 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-05-20 Xavier Claessens <xclaesse@gmail.com>
+ * libempathy-gtk/gossip-contact-list-store.c: Set COL_NAME earlier like
+ that it can directly be sorted.
+ * data/empathy.schemas.in: s/gossip/empathy/
+
+2007-05-20 Xavier Claessens <xclaesse@gmail.com>
+
* configure.ac: Bump version to 0.5
2007-05-20 Xavier Claessens <xclaesse@gmail.com>
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index e58bad7cd..103fdd2ab 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -16,9 +16,9 @@
</schema>
<schema>
- <key>/schemas/apps/gossip/contacts/sort_criterium</key>
- <applyto>/apps/gossip/contacts/sort_criterium</applyto>
- <owner>gossip</owner>
+ <key>/schemas/apps/empathy/contacts/sort_criterium</key>
+ <applyto>/apps/empathy/contacts/sort_criterium</applyto>
+ <owner>empathy</owner>
<type>string</type>
<default>name</default>
<locale name="C">
diff --git a/libempathy-gtk/gossip-contact-list-store.c b/libempathy-gtk/gossip-contact-list-store.c
index a2cbae57e..d9ece26bb 100644
--- a/libempathy-gtk/gossip-contact-list-store.c
+++ b/libempathy-gtk/gossip-contact-list-store.c
@@ -780,7 +780,10 @@ contact_list_store_add_contact (GossipContactListStore *store,
if (!groups) {
gtk_tree_store_append (GTK_TREE_STORE (store), &iter, NULL);
gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
+ COL_NAME, gossip_contact_get_name (contact),
COL_CONTACT, contact,
+ COL_IS_GROUP, FALSE,
+ COL_IS_SEPARATOR, FALSE,
-1);
}
@@ -799,7 +802,10 @@ contact_list_store_add_contact (GossipContactListStore *store,
gtk_tree_store_insert_after (GTK_TREE_STORE (store), &iter,
&iter_group, NULL);
gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
+ COL_NAME, gossip_contact_get_name (contact),
COL_CONTACT, contact,
+ COL_IS_GROUP, FALSE,
+ COL_IS_SEPARATOR, FALSE,
-1);
}