Commits

commits@gajim.org

17632 discussions

gajim: don't enable register button in disco when we select the ...
by Yann Leboulanger 14 Mar '13

14 Mar '13

changeset 7986ef9c882f in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7986ef9c882f description: don't enable register button in disco when we select the server line diffstat: src/disco.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diffs (26 lines): diff -r 6a113d5952e0 -r 7986ef9c882f src/disco.py --- a/src/disco.py Thu Mar 14 12:45:53 2013 +0100 +++ b/src/disco.py Thu Mar 14 12:47:49 2013 +0100 @@ -1526,15 +1526,18 @@ self.execute_button.set_sensitive(True) if self.search_button and nbxmpp.NS_SEARCH in features: self.search_button.set_sensitive(True) - if self.register_button and nbxmpp.NS_REGISTER in features: + # Don't autorize to register with a server via disco + if self.register_button and nbxmpp.NS_REGISTER in features and \ + jid != self.jid: # We can register this agent registered_transports = [] jid_list = gajim.contacts.get_jid_list(self.account) - for jid in jid_list: + for jid_ in jid_list: contact = gajim.contacts.get_first_contact_from_jid( - self.account, jid) + self.account, jid_) if _('Transports') in contact.groups: - registered_transports.append(jid) + registered_transports.append(jid_) + registered_transports.append(self.jid) if jid in registered_transports: self.register_button.set_label(_('_Edit')) else:

1 0

gajim: hnadle MISSING_PASSPHRASE message from gnupg when signing
by Yann Leboulanger 14 Mar '13

14 Mar '13

changeset 6a113d5952e0 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6a113d5952e0 description: hnadle MISSING_PASSPHRASE message from gnupg when signing diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d380acc0588a -r 6a113d5952e0 src/common/gnupg.py --- a/src/common/gnupg.py Mon Mar 11 20:21:59 2013 +0100 +++ b/src/common/gnupg.py Thu Mar 14 12:45:53 2013 +0100 @@ -447,7 +447,7 @@ def handle_status(self, key, value): if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", - "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL"): + "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "MISSING_PASSPHRASE"): pass elif key in ("KEYEXPIRED", "SIGEXPIRED"): self.status = 'key expired'

1 0

gajim: more fix for ipython import. Fixes #7316
by Yann Leboulanger 11 Mar '13

11 Mar '13

changeset 6c317f38b51e in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=6c317f38b51e description: more fix for ipython import. Fixes #7316 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8971d754e261 -r 6c317f38b51e src/gajim.py --- a/src/gajim.py Sun Dec 16 18:29:49 2012 +0100 +++ b/src/gajim.py Mon Mar 11 20:21:59 2013 +0100 @@ -67,7 +67,7 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', - 'Crypto.PublicKey', 'IPython'] + 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp'] if os.name == 'nt': import locale

1 0

gajim: more fix for ipython import. Fixes #7316
by Yann Leboulanger 11 Mar '13

11 Mar '13

changeset d380acc0588a in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d380acc0588a description: more fix for ipython import. Fixes #7316 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 37ae661f80d1 -r d380acc0588a src/gajim.py --- a/src/gajim.py Mon Mar 11 12:55:11 2013 +0100 +++ b/src/gajim.py Mon Mar 11 20:21:59 2013 +0100 @@ -73,7 +73,7 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', - 'Crypto.PublicKey', 'IPython', 'gst.interfaces'] + 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'gst.interfaces'] if os.name == 'nt': import locale

1 0

gajim: fix demandimport with ipython
by Yann Leboulanger 11 Mar '13

11 Mar '13

changeset 8971d754e261 in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=8971d754e261 description: fix demandimport with ipython diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4415185bef98 -r 8971d754e261 src/gajim.py --- a/src/gajim.py Sat Mar 17 19:28:48 2012 +0100 +++ b/src/gajim.py Sun Dec 16 18:29:49 2012 +0100 @@ -67,7 +67,7 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', - 'Crypto.PublicKey'] + 'Crypto.PublicKey', 'IPython'] if os.name == 'nt': import locale

1 0

gajim: update ipyton_view for ipython 0.12
by Yann Leboulanger 11 Mar '13

11 Mar '13

changeset 4415185bef98 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4415185bef98 description: update ipyton_view for ipython 0.12 diffstat: src/ipython_view.py | 174 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 116 insertions(+), 58 deletions(-) diffs (245 lines): diff -r 50e11d2f8ab1 -r 4415185bef98 src/ipython_view.py --- a/src/ipython_view.py Thu Feb 28 12:05:07 2013 +0400 +++ b/src/ipython_view.py Sat Mar 17 19:28:48 2012 +0100 @@ -51,12 +51,6 @@ try: import IPython - import IPython.iplib - import IPython.prefilter - import IPython.Shell - import IPython.genutils - import IPython.shadowns - import IPython.history except ImportError: IPython = None @@ -96,33 +90,52 @@ @type input_func: function """ if input_func: - IPython.iplib.raw_input_original = input_func + IPython.frontend.terminal.interactiveshell.raw_input_original = input_func if cin: - IPython.Shell.Term.cin = cin + IPython.utils.io.stdin = IPython.utils.io.IOStream(cin) if cout: - IPython.Shell.Term.cout = cout + IPython.utils.io.stdout = IPython.utils.io.IOStream(cout) if cerr: - IPython.Shell.Term.cerr = cerr + IPython.utils.io.stderr = IPython.utils.io.IOStream(cerr) # This is to get rid of the blockage that accurs during # IPython.Shell.InteractiveShell.user_setup() - IPython.iplib.raw_input = lambda x: None + IPython.utils.io.raw_input = lambda x: None - self.term = IPython.genutils.IOTerm(cin=cin, cout=cout, cerr=cerr) + self.term = IPython.utils.io.IOTerm(stdin=cin, stdout=cout, stderr=cerr) os.environ['TERM'] = 'dumb' excepthook = sys.excepthook - self.IP = IPython.Shell.make_IPython( - argv, user_ns=user_ns, - user_global_ns=user_global_ns, - embedded=True, - shell_class=IPython.Shell.InteractiveShell) + + from IPython.config.loader import Config + cfg = Config() + cfg.InteractiveShell.colors = "Linux" + + self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) self.IP.system = lambda cmd: self.shell(self.IP.var_expand(cmd), header='IPython system call: ', - verbose=self.IP.rc.system_verbose) + local_ns=user_ns) + #global_ns=user_global_ns) + #verbose=self.IP.rc.system_verbose) + + self.IP.raw_input = input_func sys.excepthook = excepthook self.iter_more = 0 self.history_level = 0 self.complete_sep = re.compile('[\s\{\}\[\]\(\)]') + self.updateNamespace({'exit':lambda:None}) + self.updateNamespace({'quit':lambda:None}) + self.IP.readline_startup_hook(self.IP.pre_readline) + # Workaround for updating namespace with sys.modules + # + self.__update_namespace() + + def __update_namespace(self): + ''' + Update self.IP namespace for autocompletion with sys.modules + ''' + for k,v in sys.modules.items(): + if not '.' in k: + self.IP.user_ns.update({k:v}) def execute(self): """ @@ -130,34 +143,69 @@ """ self.history_level = 0 orig_stdout = sys.stdout - sys.stdout = IPython.Shell.Term.cout + sys.stdout = self.term.stdout + + orig_stdin = sys.stdin + sys.stdin = IPython.utils.io.stdin; + self.prompt = self.generatePrompt(self.iter_more) + + self.IP.hooks.pre_prompt_hook() + if self.iter_more: + try: + self.prompt = self.generatePrompt(True) + except: + self.IP.showtraceback() + if self.IP.autoindent: + self.IP.rl_do_indent = True + try: - line = self.IP.raw_input(None, self.iter_more) - if self.IP.autoindent: - self.IP.readline_startup_hook(None) + line = self.IP.raw_input(self.prompt) except KeyboardInterrupt: self.IP.write('\nKeyboardInterrupt\n') - self.IP.resetbuffer() - # keep cache in sync with the prompt counter: - self.IP.outputcache.prompt_count -= 1 - - if self.IP.autoindent: - self.IP.indent_current_nsp = 0 - self.iter_more = 0 + self.IP.input_splitter.reset() except: self.IP.showtraceback() else: - self.iter_more = self.IP.push(line) + self.IP.input_splitter.push(line) + self.iter_more = self.IP.input_splitter.push_accepts_more() + self.prompt = self.generatePrompt(self.iter_more) if (self.IP.SyntaxTB.last_syntax_error and - self.IP.rc.autoedit_syntax): + self.IP.autoedit_syntax): self.IP.edit_syntax_error() - if self.iter_more: - self.prompt = str(self.IP.outputcache.prompt2).strip() - if self.IP.autoindent: - self.IP.readline_startup_hook(self.IP.pre_readline) + if not self.iter_more: + source_raw = self.IP.input_splitter.source_raw_reset()[1] + self.IP.run_cell(source_raw, store_history=True) + else: + # TODO: Auto-indent + # + pass + + sys.stdout = orig_stdout + sys.stdin = orig_stdin + def generatePrompt(self, is_continuation): + ''' + Generate prompt depending on is_continuation value + + @param is_continuation + @type is_continuation: boolean + + @return: The prompt string representation + @rtype: string + + ''' + + # Backwards compatibility with ipyton-0.11 + # + ver = IPython.__version__ + if '0.11' in ver: + prompt = self.IP.hooks.generate_prompt(is_continuation) else: - self.prompt = str(self.IP.outputcache.prompt1).strip() - sys.stdout = orig_stdout + if is_continuation: + prompt = self.IP.prompt_manager.render('in2') + else: + prompt = self.IP.prompt_manager.render('in') + + return prompt def historyBack(self): """ @@ -214,28 +262,37 @@ @rtype: tuple """ split_line = self.complete_sep.split(line) - possibilities = self.IP.complete(split_line[-1]) - - try: - __builtins__.all() - except AttributeError: - def all(iterable): - for element in iterable: - if not element: - return False - return True - - def common_prefix(seq): - """ - Return the common prefix of a sequence of strings - """ - return "".join(c for i, c in enumerate(seq[0]) - if all(s.startswith(c, i) for s in seq)) - if possibilities: - completed = line[:-len(split_line[-1])]+common_prefix(possibilities) + if split_line[-1]: + possibilities = self.IP.complete(split_line[-1]) else: completed = line - return completed, possibilities + possibilities = ['',[]] + if possibilities: + def _commonPrefix(str1, str2): + ''' + Reduction function. returns common prefix of two given strings. + + @param str1: First string. + @type str1: string + @param str2: Second string + @type str2: string + + @return: Common prefix to both strings. + @rtype: string + ''' + for i in range(len(str1)): + if not str2.startswith(str1[:i+1]): + return str1[:i] + return str1 + + if possibilities[1]: + common_prefix = reduce(_commonPrefix, possibilities[1]) or line[-1] + completed = line[:-len(split_line[-1])]+common_prefix + else: + completed = line + else: + completed = line + return completed, possibilities[1] def shell(self, cmd,verbose=0,debug=0,header=''): @@ -332,7 +389,7 @@ for tag in ansi_tags: i = segments.index(tag) self.text_buffer.insert_with_tags_by_name(self.text_buffer.get_end_iter(), - segments[i+1], tag) + segments[i+1], str(tag)) segments.pop(i) if not editable: self.text_buffer.apply_tag_by_name('notouch', @@ -472,6 +529,7 @@ input_func=self.raw_input) # self.connect('key_press_event', self.keyPress) self.execute() + self.prompt = self.generatePrompt(False) self.cout.truncate(0) self.showPrompt(self.prompt) self.interrupt = False

1 0

gajim: [kparal] logind suspend support. Fixes #7319
by Yann Leboulanger 11 Mar '13

11 Mar '13

changeset 37ae661f80d1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=37ae661f80d1 description: [kparal] logind suspend support. Fixes #7319 diffstat: src/gui_interface.py | 1 + src/logind_listener.py | 114 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 0 deletions(-) diffs (129 lines): diff -r b16aff279c02 -r 37ae661f80d1 src/gui_interface.py --- a/src/gui_interface.py Sun Mar 10 22:18:53 2013 +0400 +++ b/src/gui_interface.py Mon Mar 11 12:55:11 2013 +0100 @@ -2860,6 +2860,7 @@ if dbus_support.supported: import upower_listener + import logind_listener # Handle gnome screensaver if dbus_support.supported: diff -r b16aff279c02 -r 37ae661f80d1 src/logind_listener.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/logind_listener.py Mon Mar 11 12:55:11 2013 +0100 @@ -0,0 +1,114 @@ +## src/logind_listener.py +## +## Copyright (C) 2013 Kamil Paral <kamil.paral AT gmail.com> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +''' +Watch for system suspend using systemd-logind. +Documentation: http://www.freedesktop.org/wiki/Software/systemd/inhibit +''' + +import os +import logging + +from common import dbus_support +from common import gajim + +log = logging.getLogger('gajim.logind_listener') +supported = False +fd = -1 # file descriptor of the inhibitor; negative number means we don't + # hold any (yet) + + +def on_suspend(active): + '''Signal handler for suspend event''' + + global fd + + if not active: + # we just resumed, we should take another inhibitor + get_inhibitor() + return + + # we're going for suspend, let's disconnect + log.debug('System suspend detected, disconnecting from network...') + for name, conn in gajim.connections.items(): + if gajim.account_is_connected(name): + conn.old_show = gajim.SHOW_LIST[conn.connected] + st = conn.status + conn.change_status('offline', _('Machine going to sleep')) + conn.status = st + conn.time_to_reconnect = 5 + + # close the file descriptor and let the computer suspend + if fd >= 0: + os.close(fd) + fd = -1; + else: + # something is wrong, the system is suspending but we don't have + # a lock file + log.warning("System suspend detected, but we don't seem to be holding " + "a file descriptor for sleep inihibitor") + +def get_inhibitor(): + '''Ask for a suspend delay inhibitor''' + + from common.dbus_support import system_bus, dbus + bus = system_bus.bus() + global fd + + if fd >= 0: + # someting is wrong, we haven't closed the previous file descriptor + # and we ask for yet another one + log.warning('We are about to ask for a sleep inhibitor, but we seem ' + 'to be holding one already') + + login_object = bus.get_object('org.freedesktop.login1', + '/org/freedesktop/login1') + login_manager = dbus.Interface(login_object, + 'org.freedesktop.login1.Manager') + + ret = login_manager.Inhibit('sleep', 'Gajim', 'Disconnect from the network', + 'delay') + fd = ret.take() + +def set_listener(): + '''Set up a listener for suspend signals + + @return bool whether it succeeded + ''' + from common.dbus_support import system_bus + bus = system_bus.bus() + + if not 'org.freedesktop.login1' in bus.list_names(): + # logind is not present + log.debug("logind is not on D-Bus, not activating logind listener") + return False + + bus.add_signal_receiver(on_suspend, signal_name='PrepareForSleep', + bus_name='org.freedesktop.login1', + path='/org/freedesktop/login1', + dbus_interface='org.freedesktop.login1.Manager') + return True + +if dbus_support.supported: + try: + if set_listener(): + get_inhibitor() + supported = True + except Exception as ex: + log.error("A problem occured while activating logind listener")

1 0

gajim: sm modifications
by Yann Leboulanger 10 Mar '13

10 Mar '13

changeset 1a1ad2852ed3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1a1ad2852ed3 description: sm modifications diffstat: src/common/xmpp/auth_nb.py | 1 + src/common/xmpp/smacks.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diffs (52 lines): diff -r 24ee3d2a67b2 -r 1a1ad2852ed3 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Sat Feb 23 11:41:36 2013 -0400 +++ b/src/common/xmpp/auth_nb.py Sun Mar 10 22:43:37 2013 +0100 @@ -682,6 +682,7 @@ sm = self._owner._caller.sm if self.supports_sm: # starts negociation + sm.supports_sm = True sm.set_owner(self._owner) sm.negociate() self._owner.Dispatcher.sm = sm diff -r 24ee3d2a67b2 -r 1a1ad2852ed3 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Sat Feb 23 11:41:36 2013 -0400 +++ b/src/common/xmpp/smacks.py Sun Mar 10 22:43:37 2013 +0100 @@ -25,10 +25,11 @@ self.resuming = False self.enabled = False # If SM is enabled self.location = None + self.failed_resume = False # If last resuming attempt failed + self.supports_sm = False # If server supports sm def set_owner(self, owner): self._owner = owner - # Register handlers owner.Dispatcher.RegisterNamespace(NS_STREAM_MGMT) owner.Dispatcher.RegisterHandler('enabled', self._neg_response, @@ -47,13 +48,14 @@ if r == 'true' or r == 'True' or r == '1': self.resumption = True self.session_id = stanza.getAttr('id') - if r == 'false' or r == 'False' or r == '0': self.negociate(False) - l = stanza.getAttr('location') if l: self.location = l + if self.failed_resume: + self.con._discover_server_at_connection(self.con.connection) + self.failed_resume = False def negociate(self, resume=True): # Every time we attempt to negociate, we must erase all previous info @@ -119,6 +121,7 @@ # we need to bind a resource self._owner.NonBlockingBind.resuming = False self._owner._on_auth_bind(None) + self.failed_resume = True return # Doesn't support resumption

1 0

gajim: Update services.xml from xmpp.net/services.xml Fixes #7310
by Denis Fomin 10 Mar '13

10 Mar '13

changeset 50e11d2f8ab1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=50e11d2f8ab1 description: Update services.xml from xmpp.net/services.xml Fixes #7310 diffstat: data/other/servers.xml | 76 +------------------------------------------------ 1 files changed, 2 insertions(+), 74 deletions(-) diffs (87 lines): diff -r 1a1ad2852ed3 -r 50e11d2f8ab1 data/other/servers.xml --- a/data/other/servers.xml Sun Mar 10 22:43:37 2013 +0100 +++ b/data/other/servers.xml Thu Feb 28 12:05:07 2013 +0400 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?>  -<query> - <item jid="0nl1ne.at"/> - <item jid="binaryfreedom.info"/> - <item jid="boese-ban.de"/> - <item jid="brauchen.info"/> - <item jid="cassilis.net"/> - <item jid="chatmask.com"/> - <item jid="climm.org"/> - <item jid="codingteam.net"/> - <item jid="darkdna.net"/> - <item jid="default.rs"/> - <item jid="deshalbfrei.org"/> - <item jid="draugr.de"/> - <item jid="im.apinc.org"/> - <item jid="im.flosoft.biz"/> - <item jid="internet-exception.de"/> - <item jid="jabber.ccc.de"/> - <item jid="jabber.chaotic.de"/> - <item jid="jabber.co.nz"/> - <item jid="jabber.cz"/> - <item jid="jabber.fourecks.de"/> - <item jid="jabber.fsinf.at"/> - <item jid="jabber.hot-chilli.net"/> - <item jid="jabber.iitsp.com"/> - <item jid="jabber.i-pobox.net"/> - <item jid="jabber.loudas.com"/> - <item jid="jabber.minus273.org"/> - <item jid="jabber.no"/> - <item jid="jabber.org"/> - <item jid="jabber.rootbash.com"/> - <item jid="jabber.rueckgr.at"/> - <item jid="jabber.scha.de"/> - <item jid="jabber.second-home.de"/> - <item jid="jabber.sow.as"/> - <item jid="jabber.tmkis.com"/> - <item jid="jabber.yeahnah.co.nz"/> - <item jid="jabber-br.org"/> - <item jid="jabber-hispano.org"/> - <item jid="jabberbr.com"/> - <item jid="jabberd.eu"/> - <item jid="jabberes.org"/> - <item jid="jabberim.de"/> - <item jid="jabbim.com"/> - <item jid="jabbim.cz"/> - <item jid="jabbim.pl"/> - <item jid="jabbim.sk"/> - <item jid="jabme.de"/> - <item jid="jabster.pl"/> - <item jid="jaim.at"/> - <item jid="lethyro.net"/> - <item jid="limun.org"/> - <item jid="linuxlovers.at"/> - <item jid="macjabber.de"/> - <item jid="na-di.de"/> - <item jid="neko.im"/> - <item jid="netmindz.net"/> - <item jid="njs.netlab.cz"/> - <item jid="pandion.im"/> - <item jid="programmer-art.org"/> - <item jid="richim.org"/> - <item jid="sternenschweif.de"/> - <item jid="swissjabber.ch"/> - <item jid="ubuntu-jabber.de"/> - <item jid="thiessen.im"/> - <item jid="thiessen.it"/> - <item jid="thiessen.org"/> - <item jid="ubuntu-jabber.net"/> - <item jid="verdammung.org"/> - <item jid="xabber.de"/> - <item jid="xmpp.jp"/> - <item jid="xmppnet.de"/> - <item jid="zsim.de"/> -</query> +<query xmlns:reg="urn:xmpp:vcard:registration:1"><item jid="0nl1ne.at"/><item jid="blah.im"/><item jid="boese-ban.de"/><item jid="brauchen.info"/><item jid="chatme.im"/><item jid="chrome.pl"/><item jid="climm.org"/><item jid="coderollers.com"/><item jid="codingteam.net"/><item jid="comm.unicate.me"/><item jid="deshalbfrei.org"/><item jid="draugr.de"/><item jid="einfachjabber.de"/><item jid="forumanalogue.fr"/><item jid="im.apinc.org"/><item jid="im.flosoft.biz"/><item jid="internet-exception.de"/><item jid="jabb3r.net"/><item jid="jabber-br.org"/><item jid="jabber-hosting.de"/><item jid="jabber.at"/><item jid="jabber.ccc.de"/><item jid="jabber.chaotic.de"/><item jid="jabber.co.nz"/><item jid="jabber.cz"/><item jid="jabber.de"/><item jid="jabber.earth.li"/><item jid="jabber.etighichat.com"/><item jid="jabber.fourecks.de"/><item jid="jabber.gate31.net"/><item jid="jabber.hot-chilli.net"/><item jid="jabber.i-pobox.net"/><item jid="jabber.iitsp.com"/><item jid="jabber.loudas.com"/><item jid="jabber.me"/><item jid="jabber.meta.net.nz"/><item jid="jabber.minus273.org"/><item jid="jabber.no-sense.net"/><item jid="jabber.no"/><item jid="jabber.rootbash.com"/><item jid="jabber.rueckgr.at"/><item jid="jabber.scha.de"/><item jid="jabber.schnied.net"/><item jid="jabber.second-home.de"/><item jid="jabber.smash-net.org"/><item jid="jabber.sow.as"/><item jid="jabber.theforest.us"/><item jid="jabber.tmkis.com"/><item jid="jabber.yeahnah.co.nz"/><item jid="jabberd.eu"/><item jid="jabberes.org"/><item jid="jabbim.com"/><item jid="jabbim.cz"/><item jid="jabbim.pl"/><item jid="jabbim.sk"/><item jid="jabin.org"/><item jid="jabme.de"/><item jid="jabster.pl"/><item jid="jaim.at"/><item jid="jappix.com"/><item jid="jisshi.com"/><item jid="labnote.org"/><item jid="lightwitch.org"/><item jid="limun.org"/><item jid="macjabber.de"/><item jid="mayplaces.com"/><item jid="na-di.de"/><item jid="neko.im"/><item jid="netmindz.net"/><item jid="njs.netlab.cz"/><item jid="palita.net"/><item jid="pandion.im"/><item jid="pidgin.su"/><item jid="programmer-art.org"/><item jid="prosody.de"/><item jid="richim.org"/><item jid="rkquery.de"/><item jid="sss.chaoslab.ru"/><item jid="sternenschweif.de"/><item jid="swissjabber.ch"/><item jid="swissjabber.de"/><item jid="swissjabber.eu"/><item jid="swissjabber.li"/><item jid="swissjabber.org"/><item jid="tcweb.org"/><item jid="tekst.me"/><item jid="thiessen.im"/><item jid="thiessen.it"/><item jid="thiessen.org"/><item jid="tigase.im"/><item jid="twattle.net"/><item jid="ubuntu-jabber.de"/><item jid="ubuntu-jabber.net"/><item jid="univers-libre.net"/><item jid="verdammung.org"/><item jid="wtfismyip.com"/><item jid="xabber.de"/><item jid="xmpp-hosting.de"/><item jid="xmpp.jp"/><item jid="xmppnet.de"/><item jid="zauris.ru"/><item jid="zsim.de"/></query>

1 0

gajim: Ask for discovery information (and archive) after SM is e...
by Jefry Lagrange 10 Mar '13

10 Mar '13

changeset 24ee3d2a67b2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=24ee3d2a67b2 description: Ask for discovery information (and archive) after SM is enabled. Fixes #7299 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b41ccab14a49 -r 24ee3d2a67b2 src/common/connection.py --- a/src/common/connection.py Thu Feb 21 19:03:20 2013 +0100 +++ b/src/common/connection.py Sat Feb 23 11:41:36 2013 -0400 @@ -1662,7 +1662,7 @@ # If we are not resuming, we ask for discovery info # and archiving preferences - if not self.sm.resuming: + if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled): self.request_message_archiving_preferences() self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'), id_prefix='Gajim_')

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits