[commit-gajim] r8924 - trunk/src - Commits

22 Oct 2007

Author: asterix
Date: 2007-10-22 10:54:07 +0200 (Mon, 22 Oct 2007)
New Revision: 8924
Modified:
   trunk/src/disco.py
Log:
discover correctly items that are discoverable. see #3479
Modified: trunk/src/disco.py
===================================================================

--- trunk/src/disco.py	2007-10-21 16:59:47 UTC (rev 8923)
+++ trunk/src/disco.py	2007-10-22 08:54:07 UTC (rev 8924)
@@ -67,6 +67,7 @@
    	# Jabber server
    	('server', 'im'):				(ToplevelAgentBrowser, 'jabber.png'),
    	('services', 'jabber'):		(ToplevelAgentBrowser, 'jabber.png'),
+		('hierarchy', 'branch'):	(AgentBrowser, 'jabber.png'),
# Services
    	('conference', 'text'):		(MucBrowser, 'conference.png'),
@@ -953,6 +954,7 @@
    	disco#items query.'''
    	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):
    	'''Called when an item should be updated in the model. The result of a
@@ -963,7 +965,9 @@
    def _update_info(self, iter, jid, node, identities, features, data):
    	'''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):
    	'''Called when a disco#info query failed for an item.'''

    