Changeset 8924

Timestamp:

10/22/07 10:54:07 (14 months ago)

Author:

asterix

Message:

discover correctly items that are discoverable. see #3479

Files:

• trunk/src/disco.py (modified) (3 diffs)

trunk/src/disco.py

@@ -68 +68 @@
                 ('server', 'im'):                               (ToplevelAgentBrowser, 'jabber.png'),
                 ('services', 'jabber'):         (ToplevelAgentBrowser, 'jabber.png'),
+                ('hierarchy', 'branch'):        (AgentBrowser, 'jabber.png'),
 
                 # Services
@@ -954 +955 @@
                 self.model.append((jid, node, item.get('name', ''),
                         get_agent_address(jid, node)))
+                self.cache.get_info(jid, node, self._agent_info, force = force)
 
         def _update_item(self, iter, jid, node, item):
@@ -964 +966 @@
                 '''Called when an item should be updated in the model with further info.
                 The result of a disco#info query.'''
-                self.model[iter][2] = identities[0].get('name', '')
+                name = identities[0].get('name', '')
+                if name:
+                        self.model[iter][2] = name
 
         def _update_error(self, iter, jid, node):