Changeset 7984 for branches/gajim_0.11/src/disco.py

Timestamp:

02/15/07 19:05:38 (22 months ago)

Author:

asterix

Message:

mrege diff from trunk

Files:

• branches/gajim_0.11/src/disco.py (modified) (8 diffs)

branches/gajim_0.11/src/disco.py

@@ -1725 +1725 @@
                 ''' Create treemodel for the window. '''
                 # JID, node, name (with description) - pango markup, dont have info?, subscribed?
-                model = gtk.ListStore(str, str, str, bool, bool)
-                model.set_sort_column_id(3, gtk.SORT_ASCENDING)
-                self.window.services_treeview.set_model(model)
+                self.model = gtk.ListStore(str, str, str, bool, bool)
+                self.model.set_sort_column_id(3, gtk.SORT_ASCENDING)
+                self.window.services_treeview.set_model(self.model)
 
                 # Name column
@@ -1749 +1749 @@
                 self.window.services_treeview.set_headers_visible(True)
 
-        def _add_item(self, model, jid, node, item, force):
+        def _add_item(self, jid, node, item, force):
                 ''' Called when we got basic information about new node from query.
                 Show the item. '''
@@ -1756 +1756 @@
                 if self.subscriptions is not None:
                         dunno = False
-                        subscribed = name in self.subscriptions
+                        subscribed = node in self.subscriptions
                 else:
                         dunno = True
@@ -1764 +1764 @@
                 name = '<b>%s</b>' % name
 
-                model.append((jid, node, name, dunno, subscribed))
+                self.model.append((jid, node, name, dunno, subscribed))
 
         def _add_actions(self):
@@ -1846 +1846 @@
                 ''' We got the subscribed groups list stanza. Now, if we already
                 have items on the list, we should actualize them. '''
-                print 0
                 try:
                         subscriptions = request.getTag('pubsub').getTag('subscriptions')
@@ -1852 +1851 @@
                         return 
 
-                print 1
                 groups = set()
                 for child in subscriptions.getTags('subscription'):
-                        print 2, repr(child), str(child)
                         groups.add(child['node'])
-                print 3, groups
 
                 self.subscriptions = groups
@@ -1863 +1859 @@
                 # try to setup existing items in model
                 model = self.window.services_treeview.get_model()
-                print 4
                 for row in model:
-                        print 5
                         # 1 = group node
                         # 3 = insensitive checkbox for subscribed
@@ -1872 +1866 @@
                         row[3]=False
                         row[4]=groupnode in groups
-                print 6
 
                 # we now know subscriptions, update button states