Author: asterix Date: 2009-05-04 13:28:15 +0200 (Mon, 04 May 2009) New Revision: 11268

Modified: branches/gajim_0.12/src/common/xmpp/auth.py branches/gajim_0.12/src/common/xmpp/auth_nb.py Log: prevent traceback when password is None. Fixes #5003

Modified: branches/gajim_0.12/src/common/xmpp/auth.py =================================================================== --- branches/gajim_0.12/src/common/xmpp/auth.py 2009-05-02 18:59:54 UTC (rev 11267) +++ branches/gajim_0.12/src/common/xmpp/auth.py 2009-05-04 11:28:15 UTC (rev 11268) @@ -35,7 +35,7 @@ PlugIn.__init__(self) self.DBG_LINE='gen_auth' self.user=user - self.password=password + self.password=password or '' self.resource=resource

def plugin(self,owner): @@ -99,7 +99,7 @@ def __init__(self,username,password): PlugIn.__init__(self) self.username=username - self.password=password + self.password=password or ''

def plugin(self,owner): if 'version' not in self._owner.Dispatcher.Stream._document_attrs: self.startsasl='not-supported' @@ -305,4 +305,4 @@ self.DEBUG('Binding failed: timeout expired.','error') return ''

-# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

Modified: branches/gajim_0.12/src/common/xmpp/auth_nb.py =================================================================== --- branches/gajim_0.12/src/common/xmpp/auth_nb.py 2009-05-02 18:59:54 UTC (rev 11267) +++ branches/gajim_0.12/src/common/xmpp/auth_nb.py 2009-05-04 11:28:15 UTC (rev 11268) @@ -96,7 +96,7 @@ def __init__(self,username,password, on_sasl): PlugIn.__init__(self) self.username=username - self.password=password + self.password=password or '' self.on_sasl = on_sasl self.realm = None def plugin(self,owner): @@ -284,7 +284,7 @@ PlugIn.__init__(self) self.DBG_LINE ='gen_auth' self.user = user - self.password= password + self.password= password or '' self.resource = resource self.on_auth = on_auth