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

Fix zeroconf error handling

This commit is contained in:
Denis Fomin 2010-12-01 19:57:54 +03:00
parent 7bf519dca1
commit 7996ca728f
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/common/zeroconf/connection_zeroconf.py
View File

@ -192,9 +192,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
show='offline')) show='offline'))
self.status = 'offline' self.status = 'offline'
self.dispatch('CONNECTION_LOST', gajim.nec.push_incoming_event(ConnectionLostEvent(None,
(_('Could not connect to "%s"') % self.name, conn=self, title=_('Could not connect to "%s"') % self.name,
_('Please check if Avahi or Bonjour is installed.'))) msg=_('Please check if Avahi or Bonjour is installed.')))
self.disconnect() self.disconnect()
return return
result = self.connection.connect(show, msg) result = self.connection.connect(show, msg)
@ -203,13 +203,13 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
show='offline')) show='offline'))
self.status = 'offline' self.status = 'offline'
if result is False: if result is False:
self.dispatch('CONNECTION_LOST', gajim.nec.push_incoming_event(ConnectionLostEvent(None,
(_('Could not start local service'), conn=self, title=_('Could not start local service'),
_('Unable to bind to port %d.' % self.port))) msg=_('Unable to bind to port %d.' % self.port)))
else: # result is None else: # result is None
self.dispatch('CONNECTION_LOST', gajim.nec.push_incoming_event(ConnectionLostEvent(None,
(_('Could not start local service'), conn=self, title=_('Could not start local service'),
_('Please check if avahi-daemon is running.'))) msg=_('Please check if avahi-daemon is running.')))
self.disconnect() self.disconnect()
return return
else: else:
@ -289,9 +289,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
show='offline')) show='offline'))
self.status = 'offline' self.status = 'offline'
self.dispatch('CONNECTION_LOST', gajim.nec.push_incoming_event(ConnectionLostEvent(None, conn=self,
(_('Could not change status of account "%s"') % self.name, title=_('Could not change status of account "%s"') % self.name,
_('Please check if avahi-daemon is running.'))) msg=_('Please check if avahi-daemon is running.')))
def _change_to_invisible(self, msg): def _change_to_invisible(self, msg):
if self.connection.remove_announce(): if self.connection.remove_announce():
@ -302,9 +302,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
show='offline')) show='offline'))
self.status = 'offline' self.status = 'offline'
self.dispatch('CONNECTION_LOST', gajim.nec.push_incoming_event(ConnectionLostEvent(None, conn=self,
(_('Could not change status of account "%s"') % self.name, title=_('Could not change status of account "%s"') % self.name,
_('Please check if avahi-daemon is running.'))) msg=_('Please check if avahi-daemon is running.')))
def _change_from_invisible(self): def _change_from_invisible(self):
self.connection.announce() self.connection.announce()
@ -318,9 +318,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
show='offline')) show='offline'))
self.status = 'offline' self.status = 'offline'
self.dispatch('CONNECTION_LOST', gajim.nec.push_incoming_event(ConnectionLostEvent(None, conn=self,
(_('Could not change status of account "%s"') % self.name, title=_('Could not change status of account "%s"') % self.name,
_('Please check if avahi-daemon is running.'))) msg=_('Please check if avahi-daemon is running.')))
def send_message(self, jid, msg, keyID, type_='chat', subject='', def send_message(self, jid, msg, keyID, type_='chat', subject='',
chatstate=None, msg_id=None, composing_xep=None, resource=None, chatstate=None, msg_id=None, composing_xep=None, resource=None,