From 599e8d15a451e487626087de81a9a89caca20901 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Sat, 17 Sep 2005 11:26:15 +0000 Subject: [PATCH] add two more ft proxies until we get to autodiscover if the server we have the JID on, has support and we prio on that --- src/common/config.py | 5 +++-- src/gtkgui_helpers.py | 9 ++++----- src/remote_control.py | 4 +--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/common/config.py b/src/common/config.py index 48e2ca130..4d552017e 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -184,7 +184,7 @@ class Config: 'http_auth': [opt_str, 'ask'], # yes, no, ask # proxy65 for FT 'file_transfer_proxies': [opt_str, - 'proxy.jabber.org, proxy65.jabber.autocom.pl, proxy.jabber.cd.chalmers.se, proxy.netlab.cz'] + 'proxy.jabber.org, proxy65.jabber.autocom.pl, proxy.jabber.cd.chalmers.se, proxy.netlab.cz', 'proxy65.jabber.ccc.de','proxy65.unstable.nl'] }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], @@ -338,7 +338,8 @@ class Config: 'proxy65.jabber.autocom.pl': ['213.134.161.52', '7777', 'proxy65.jabber.autocom.pl'], 'proxy.jabber.cd.chalmers.se': ['129.16.79.37', '7777', 'proxy.jabber.cd.chalmers.se'], 'proxy.netlab.cz': ['82.119.241.3', '7777', 'proxy.netlab.cz'], - 'proxy65.unstable.nl': ['84.107.143.192', '7777', 'proxy65.unstable.nl'] + 'proxy65.jabber.ccc.de': ['217.10.10.196', '7777', 'proxy65.jabber.ccc.de'], + 'proxy65.unstable.nl': ['84.107.143.192', '7777', 'proxy65.unstable.nl'], } def foreach(self, cb, data = None): diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py index 7d5a50b6a..8aeb1f8f9 100644 --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -34,7 +34,7 @@ screen_w = gtk.gdk.screen_width() screen_h = gtk.gdk.screen_height() def get_theme_font_for_option(theme, option): - ''' return string description of the font, stored in + '''return string description of the font, stored in theme preferences''' font_name = gajim.config.get_per('themes', theme, option) font_desc = pango.FontDescription() @@ -49,7 +49,7 @@ def get_theme_font_for_option(theme, option): return fd.to_string() def get_default_font(): - ''' Get the desktop setting for application font + '''Get the desktop setting for application font first check for GNOME, then XFCE and last KDE it returns None on failure or else a string 'Font Size' ''' @@ -104,12 +104,11 @@ def get_default_font(): def reduce_chars_newlines(text, max_chars = 0, max_lines = 0, widget = None): - ''' Cut the chars after 'max_chars' on each line + '''Cut the chars after 'max_chars' on each line and show only the first 'max_lines'. If there is more text to be shown, display the whole text in tooltip on 'widget' If any of the params is not present(None or 0) the action - on it is not performed - ''' + on it is not performed''' text = text def _cut_if_long(str): diff --git a/src/remote_control.py b/src/remote_control.py index 63bc64586..fdc99a77c 100644 --- a/src/remote_control.py +++ b/src/remote_control.py @@ -207,9 +207,7 @@ class SignalObject(DbusPrototype): if not jid: # FIXME: raise exception for missing argument (dbus0.35+) return None - if jid.startswith('xmpp://'): - jid = jid[7:] # len('xmpp://') = 7 - elif jid.startswith('xmpp:'): + if jid.startswith('xmpp:'): jid = jid[5:] # len('xmpp:') = 5 if account: