# HG changeset patch
# User drewp@bigasterisk.com
# Date 2014-06-15 18:21:16
# Node ID 37199cea3a2a06ccdac89c14303255e1e421c40c
# Parent  5e7acb866b9fc77a13ce906eae67beb564eac846

KC fix sortin
Ignore-this: 70ff3a7c177d1c60e4a2181639b91a6f

diff --git a/bin/keyboardcomposer b/bin/keyboardcomposer
--- a/bin/keyboardcomposer
+++ b/bin/keyboardcomposer
@@ -221,13 +221,16 @@ class KeyboardComposer(Frame, SubClient)
         # there are unlikely to be any subs at startup because we
         # probably haven't been called back with the graph data yet
 
-        withgroups = sorted((self.graph.value(sub.uri, L9['group']),
-                             self.graph.value(sub.uri, L9['order']),
-                             sub)
+        withgroups = sorted(
+            (self.graph.value(sub.uri, L9['group']),
+             self.graph.value(sub.uri, L9['order']),
+             self.graph.label(sub), # todo: split numbers into ints so they sort right
+             sub.uri, 
+             sub)
             for sub in self.submasters.get_all_subs())
         log.info("withgroups %s", withgroups)
 
-        for group, order, sub in withgroups:
+        for group, order, _sortLabel, _sortUri, sub in withgroups:
             group = self.graph.value(sub.uri, L9['group'])
 
             if col == 0 or group != last_group: