copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

show transports rows when we are online, and hide them when we are offline

This commit is contained in:
Yann Leboulanger 2005-05-25 18:25:39 +00:00
parent 1c86ae3f18
commit 693aad9b19
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/xmpp/auth.py
View File

@ -98,6 +98,9 @@ class SASL(PlugIn):
""" Implements SASL authentication. """ """ Implements SASL authentication. """
def plugin(self,owner): def plugin(self,owner):
if not self._owner.Dispatcher.Stream._document_attrs.has_key('version'): self.startsasl='not-supported' if not self._owner.Dispatcher.Stream._document_attrs.has_key('version'): self.startsasl='not-supported'
elif self._owner.Dispatcher.Stream.features:
try: self.FeaturesHandler(self._owner.Dispatcher,self._owner.Dispatcher.Stream.features)
except NodeProcessed: pass
else: self.startsasl=None else: self.startsasl=None
def auth(self,username,password): def auth(self,username,password):

5
src/roster_window.py
View File

@ -116,7 +116,8 @@ class Roster_window:
user.groups.append('General') user.groups.append('General')
if (user.show == 'offline' or user.show == 'error') and \ if (user.show == 'offline' or user.show == 'error') and \
not showOffline and not 'Transports' in user.groups and \ not showOffline and (not 'Transports' in user.groups or \
gajim.connections[account].connected < 2) and \
not self.plugin.queues[account].has_key(user.jid): not self.plugin.queues[account].has_key(user.jid):
return return
@ -152,6 +153,8 @@ class Roster_window:
def really_remove_user(self, user, account): def really_remove_user(self, user, account):
if user.jid in self.newly_added[account]: if user.jid in self.newly_added[account]:
return return
if user.jid.find('@') < 1 and gajim.connections[account].connected > 1: # It's an agent
return
if user.jid in self.to_be_removed[account]: if user.jid in self.to_be_removed[account]:
self.to_be_removed[account].remove(user.jid) self.to_be_removed[account].remove(user.jid)
if gajim.config.get('showoffline'): if gajim.config.get('showoffline'):