Changeset 8955 for branches/gajim_0.11.2/src/disco.py

Timestamp:

11/09/07 20:30:15 (13 months ago)

Author:

asterix

Message:

merge some fixes from trunk: [8864] [8866] [8881] [8884] [8887] [8894] [8895] [8902] [8903] [8904] [8905] [8906] [8910] [8918] [8919] [8921] [8923] [8924] [8938] [8942] [8952] [8953] [8954]

Files:

• branches/gajim_0.11.2/src/disco.py (modified) (4 diffs)

branches/gajim_0.11.2/src/disco.py

@@ -66 +66 @@
                 ('server', 'im'):                               (ToplevelAgentBrowser, 'jabber.png'),
                 ('services', 'jabber'):         (ToplevelAgentBrowser, 'jabber.png'),
+                ('hierarchy', 'branch'):        (AgentBrowser, 'jabber.png'),
 
                 # Services
@@ -78 +79 @@
                 ('pubsub', 'service'):          (PubSubBrowser, 'pubsub.png'),
                 ('proxy', 'bytestreams'):       (None, 'bytestreams.png'), # Socks5 FT proxy
+                ('headline', 'newmail'):        (ToplevelAgentBrowser, 'mail.png'),
 
                 # Transports
@@ -960 +962 @@
                 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):
@@ -970 +973 @@
                 '''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):