Set COL_NAME earlier like that it can directly be sorted.

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/

svn path=/trunk/; revision=83

diff --git a/ChangeLog b/ChangeLog
index e445d8f3e77cd823df85671fb5d7f572e834a6b8..9ba82b074c7285d44634691d89078e06c2291916 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index e58bad7cdd6ec4be50fd6bb44789c33c06c59160..103fdd2ab62852781370affa3deed98e86b9b589 100644 (file)
--- 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 a2cbae57eb45791b9c5415d07c54a91f34b665e6..d9ece26bba4b73f2104060db8e86da6e3f7b1b27 100644 (file)
--- 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);
        }