Fix sort order in flat person view

svn: r14672

src/gui/views/treemodels/flatbasemodel.py

@@ -516,8 +516,8 @@ class FlatBaseModel(gtk.GenericTreeModel):
         # use cursor as a context manager
         with self.gen_cursor() as cursor:   
             #loop over database and store the sort field, and the handle
-            return sorted( (conv_unicode_tosrtkey_ongtk(self.sort_func(data)),  
-                            key) for key, data in cursor )
+            return sorted((map(conv_unicode_tosrtkey_ongtk,
+                           self.sort_func(data)), key) for key, data in cursor)
 
     def _rebuild_search(self, ignore=None):
         """ function called when view must be build, given a search text

src/gui/views/treemodels/peoplemodel.py

@@ -178,7 +178,7 @@ class PeopleBaseModel(object):
     def sort_name(self, data):
         n = Name()
         n.unserialize(data[COLUMN_NAME])
-        return name_displayer.sort_string(n)
+        return (n.get_group_name(), n.get_first_name())
 
     def column_name(self, data):
         handle = data[0]