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

fix traceback when using a non-BOSH proxy. Fixes #5449

This commit is contained in:
Yann Leboulanger 2009-11-25 12:25:28 +01:00
parent ddb493c87d
commit 7eb24c3c53
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/xmpp/transports_nb.py
View File

@ -72,7 +72,7 @@ def get_proxy_data_from_dict(proxy):
# with proxy!=bosh or with bosh over HTTP proxy we're connecting to proxy # with proxy!=bosh or with bosh over HTTP proxy we're connecting to proxy
# machine # machine
tcp_host, tcp_port = proxy['host'], proxy['port'] tcp_host, tcp_port = proxy['host'], proxy['port']
if proxy['useauth']: if proxy.get('useauth', False):
proxy_user, proxy_pass = proxy['user'], proxy['pass'] proxy_user, proxy_pass = proxy['user'], proxy['pass']
return tcp_host, tcp_port, proxy_user, proxy_pass return tcp_host, tcp_port, proxy_user, proxy_pass

6
src/profile_window.py
View File

@ -68,7 +68,7 @@ class ProfileWindow:
return True # loop forever return True # loop forever
def remove_statusbar(self, message_id): def remove_statusbar(self, message_id):
self.statusbar.remove(self.context_id, message_id) self.statusbar.remove_message(self.context_id, message_id)
self.remove_statusbar_timeout_id = None self.remove_statusbar_timeout_id = None
def on_profile_window_destroy(self, widget): def on_profile_window_destroy(self, widget):
@ -246,7 +246,7 @@ class ProfileWindow:
self.set_value(i + '_entry', vcard_[i]) self.set_value(i + '_entry', vcard_[i])
if self.update_progressbar_timeout_id is not None: if self.update_progressbar_timeout_id is not None:
if self.message_id: if self.message_id:
self.statusbar.remove(self.context_id, self.message_id) self.statusbar.remove_message(self.context_id, self.message_id)
self.message_id = self.statusbar.push(self.context_id, self.message_id = self.statusbar.push(self.context_id,
_('Information received')) _('Information received'))
self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3, self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3,
@ -341,7 +341,7 @@ class ProfileWindow:
def vcard_not_published(self): def vcard_not_published(self):
if self.message_id: if self.message_id:
self.statusbar.remove(self.context_id, self.message_id) self.statusbar.remove_message(self.context_id, self.message_id)
self.message_id = self.statusbar.push(self.context_id, self.message_id = self.statusbar.push(self.context_id,
_('Information NOT published')) _('Information NOT published'))
self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3, self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3,