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

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

This commit is contained in:
Nikos Kouremenos 2005-09-17 11:26:15 +00:00
parent 223a2627b5
commit 599e8d15a4
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/config.py
View File

@ -184,7 +184,7 @@ class Config:
'http_auth': [opt_str, 'ask'], # yes, no, ask 'http_auth': [opt_str, 'ask'], # yes, no, ask
# proxy65 for FT # proxy65 for FT
'file_transfer_proxies': [opt_str, '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': ({ 'statusmsg': ({
'message': [ opt_str, '' ], 'message': [ opt_str, '' ],
@ -338,7 +338,8 @@ class Config:
'proxy65.jabber.autocom.pl': ['213.134.161.52', '7777', 'proxy65.jabber.autocom.pl'], '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.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'], '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): def foreach(self, cb, data = None):

9
src/gtkgui_helpers.py
View File

@ -34,7 +34,7 @@ screen_w = gtk.gdk.screen_width()
screen_h = gtk.gdk.screen_height() screen_h = gtk.gdk.screen_height()
def get_theme_font_for_option(theme, option): 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''' theme preferences'''
font_name = gajim.config.get_per('themes', theme, option) font_name = gajim.config.get_per('themes', theme, option)
font_desc = pango.FontDescription() font_desc = pango.FontDescription()
@ -49,7 +49,7 @@ def get_theme_font_for_option(theme, option):
return fd.to_string() return fd.to_string()
def get_default_font(): 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 first check for GNOME, then XFCE and last KDE
it returns None on failure or else a string 'Font Size' ''' 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, def reduce_chars_newlines(text, max_chars = 0, max_lines = 0,
widget = None): 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 and show only the first 'max_lines'. If there is more text
to be shown, display the whole text in tooltip on 'widget' to be shown, display the whole text in tooltip on 'widget'
If any of the params is not present(None or 0) the action 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 text = text
def _cut_if_long(str): def _cut_if_long(str):

4
src/remote_control.py
View File

@ -207,9 +207,7 @@ class SignalObject(DbusPrototype):
if not jid: if not jid:
# FIXME: raise exception for missing argument (dbus0.35+) # FIXME: raise exception for missing argument (dbus0.35+)
return None return None
if jid.startswith('xmpp://'): if jid.startswith('xmpp:'):
jid = jid[7:] # len('xmpp://') = 7
elif jid.startswith('xmpp:'):
jid = jid[5:] # len('xmpp:') = 5 jid = jid[5:] # len('xmpp:') = 5
if account: if account: