Changeset 8691

Timestamp:

09/03/07 10:52:12 (15 months ago)

Author:

asterix

Message:

use 2 columns in Muc browser so that int and str are stored. we show str and we sort on int

Files:

• branches/gajim_0.11.1/src/disco.py (modified) (6 diffs)

branches/gajim_0.11.1/src/disco.py

@@ -1488 +1488 @@
 
         def _create_treemodel(self):
-                # JID, node, name, users, description, fetched
+                # JID, node, name, users_int, users_str, description, fetched
                 # This is rather long, I'd rather not use a data_func here though.
                 # Users is a string, because want to be able to leave it empty.
-                self.model = gtk.ListStore(str, str, str, str, str, bool)
+                self.model = gtk.ListStore(str, str, str, int, str, str, bool)
                 self.model.set_sort_column_id(2, gtk.SORT_ASCENDING)
                 self.window.services_treeview.set_model(self.model)
@@ -1508 +1508 @@
                 renderer = gtk.CellRendererText()
                 col.pack_start(renderer)
-                col.set_attributes(renderer, text = 3)
+                col.set_attributes(renderer, text = 4)
                 col.set_sort_column_id(3)
                 self.window.services_treeview.insert_column(col, -1)
@@ -1516 +1516 @@
                 renderer = gtk.CellRendererText()
                 col.pack_start(renderer)
-                col.set_attributes(renderer, text = 4)
+                col.set_attributes(renderer, text = 5)
                 col.set_sort_column_id(4)
                 self.window.services_treeview.insert_column(col, -1)
@@ -1631 +1631 @@
                         pass
                 while iter and self.model.get_path(iter) != end:
-                        if not self.model.get_value(iter, 5):
+                        if not self.model.get_value(iter, 6):
                                 jid = self.model.get_value(iter, 0).decode('utf-8')
                                 node = self.model.get_value(iter, 1).decode('utf-8')
@@ -1662 +1662 @@
                                 if name:
                                         self.model[iter][2] = name
-                                self.model[iter][3] = len(items)                # The number of users
-                                self.model[iter][5] = True
+                                self.model[iter][3] = len(items) # The number of users
+                                self.model[iter][4] = str(len(items)) # The number of users
+                                self.model[iter][6] = True
                 self._fetch_source = None
                 self._query_visible()
 
         def _add_item(self, jid, node, item, force):
-                self.model.append((jid, node, item.get('name', ''), '', '', False))
+                self.model.append((jid, node, item.get('name', ''), -1, '', '', False))
                 if not self._fetch_source:
                         self._fetch_source = gobject.idle_add(self._start_info_query)
@@ -1682 +1683 @@
                                 descr = form.getField('muc#roominfo_description')
                                 if users:
-                                        self.model[iter][3] = users.getValue()
+                                        self.model[iter][3] = int(users.getValue())
+                                        self.model[iter][4] = users.getValue()
                                 if descr:
-                                        self.model[iter][4] = descr.getValue()
+                                        self.model[iter][5] = descr.getValue()
                                 # Only set these when we find a form with additional info
                                 # Some servers don't support forms and put extra info in
                                 # the name attribute, so we preserve it in that case.
                                 self.model[iter][2] = name
-                                self.model[iter][5] = True
+                                self.model[iter][6] = True
                                 break
                 else: