Commits March 2012

commits@gajim.org

4 participants
56 discussions

gajim: [leon] show account name in tooltip rather than in roster...
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset e85378e7a9ef in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e85378e7a9ef description: [leon] show account name in tooltip rather than in roster in merged mode. Fixes #7118 diffstat: src/roster_window.py | 23 ----------------------- src/tooltips.py | 5 +++++ 2 files changed, 5 insertions(+), 23 deletions(-) diffs (48 lines): diff -r 5295fadc4308 -r e85378e7a9ef src/roster_window.py --- a/src/roster_window.py Sun Mar 11 19:38:44 2012 +0100 +++ b/src/roster_window.py Tue Mar 13 14:32:09 2012 +0100 @@ -1163,29 +1163,6 @@ name += i18n.paragraph_direction_mark(unicode(name)) name += u' (%d)' % nb_connected_contact - # show (account_name) if there are 2 contact with same jid - # in merged mode - if self.regroup: - add_acct = False - # look through all contacts of all accounts - for account_ in gajim.connections: - # useless to add account name - if account_ == account: - continue - for jid_ in gajim.contacts.get_jid_list(account_): - contact_ = gajim.contacts.get_first_contact_from_jid( - account_, jid_) - if contact_.get_shown_name() == contact.get_shown_name() \ - and (jid_, account_) != (jid, account): - add_acct = True - break - if add_acct: - # No need to continue in other account - # if we already found one - break - if add_acct: - name += ' (' + account + ')' - # add status msg, if not empty, under contact name in # the treeview if contact.status and gajim.config.get('show_status_msgs_in_roster'): diff -r 5295fadc4308 -r e85378e7a9ef src/tooltips.py --- a/src/tooltips.py Sun Mar 11 19:38:44 2012 +0100 +++ b/src/tooltips.py Tue Mar 13 14:32:09 2012 +0100 @@ -498,6 +498,11 @@ name_markup = u'' + \ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '' + if gajim.config.get('mergeaccounts'): + name_markup += u" (" + \ + gobject.markup_escape_text(prim_contact.account.name) \ + + ')' + if self.account and helpers.jid_is_blocked(self.account, prim_contact.jid): name_markup += _(' [blocked]')

1 0

gajim: update ipyton_view for ipython 0.12
by Yann Leboulanger 17 Mar '12

17 Mar '12

changeset dfd2481bd433 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dfd2481bd433 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 f23bcb7fde59 -r dfd2481bd433 src/ipython_view.py --- a/src/ipython_view.py Fri Mar 16 23:09:00 2012 +0100 +++ 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: fix anonymous login when server has a SSL error. Fixes #7121
by Yann Leboulanger 16 Mar '12

16 Mar '12

changeset f23bcb7fde59 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f23bcb7fde59 description: fix anonymous login when server has a SSL error. Fixes #7121 diffstat: src/common/connection.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r c45f01083b60 -r f23bcb7fde59 src/common/connection.py --- a/src/common/connection.py Wed Mar 14 23:49:37 2012 -0400 +++ b/src/common/connection.py Fri Mar 16 23:09:00 2012 +0100 @@ -1333,7 +1333,10 @@ msg=_('Connection with account %s has been lost. Retry ' 'connecting.') % self.name)) return - name = gajim.config.get_per('accounts', self.name, 'name') + if gajim.config.get_per('accounts', self.name, 'anonymous_auth'): + name = None + else: + name = gajim.config.get_per('accounts', self.name, 'name') self._register_handlers(self.connection, 'ssl') self.connection.auth(name, self.password, self.server_resource, 1, self.__on_auth)

1 0

gajim: make sure SM is disabled with reconnecting
by Jefry Lagrange 15 Mar '12

15 Mar '12

changeset c45f01083b60 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c45f01083b60 description: make sure SM is disabled with reconnecting diffstat: src/common/connection.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 6de8c6d1b7cd -r c45f01083b60 src/common/connection.py --- a/src/common/connection.py Wed Mar 14 23:37:32 2012 -0400 +++ b/src/common/connection.py Wed Mar 14 23:49:37 2012 -0400 @@ -811,6 +811,7 @@ gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) else: + self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) self.disconnect()

1 0

gajim: [Matthew Wild] fix stream management error handling. Fixe...
by Jefry Lagrange 15 Mar '12

15 Mar '12

changeset 6de8c6d1b7cd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6de8c6d1b7cd description: [Matthew Wild] fix stream management error handling. Fixes #7091 diffstat: src/common/xmpp/smacks.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r ca96072dfd05 -r 6de8c6d1b7cd src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Tue Mar 13 17:30:48 2012 +0100 +++ b/src/common/xmpp/smacks.py Wed Mar 14 23:37:32 2012 -0400 @@ -114,6 +114,7 @@ # Ask for service discovery, etc.. if stanza.getTag('item-not-found'): self.resuming = False + self.enabled = False # we need to bind a resource self._owner.NonBlockingBind.resuming = False self._owner._on_auth_bind(None)

1 0

gajim: handle data forms in groupchat messages. This way room ad...
by Yann Leboulanger 13 Mar '12

13 Mar '12

changeset ca96072dfd05 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca96072dfd05 description: handle data forms in groupchat messages. This way room admins can handle voice requests. diffstat: src/common/connection_handlers_events.py | 2 ++ src/gui_interface.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diffs (40 lines): diff -r c3ca90235f5b -r ca96072dfd05 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Mar 13 14:42:52 2012 +0100 +++ b/src/common/connection_handlers_events.py Tue Mar 13 17:30:48 2012 +0100 @@ -1280,6 +1280,8 @@ if self.status_code != []: gajim.nec.push_incoming_event(GcConfigChangedReceivedEvent( None, conn=self.conn, msg_event=self)) + if self.msg_obj.form_node: + return True return self.displaymarking = None diff -r c3ca90235f5b -r ca96072dfd05 src/gui_interface.py --- a/src/gui_interface.py Tue Mar 13 14:42:52 2012 +0100 +++ b/src/gui_interface.py Tue Mar 13 17:30:48 2012 +0100 @@ -329,6 +329,16 @@ if gc_control and gc_control.autorejoin: gc_control.autorejoin = False + def handle_event_gc_message(self, obj): + if not obj.stanza.getTag('body'): # no <body> + # It could be a voice request. See + # http://www.xmpp.org/extensions/xep-0045.html#voiceapprove + if obj.msg_obj.form_node: + dialogs.SingleMessageWindow(obj.conn.name, obj.fjid, + action='receive', from_whom=obj.fjid, + subject='', message='', resource='', session=None, + form_node=obj.msg_obj.form_node) + def handle_event_presence(self, obj): # 'NOTIFY' (account, (jid, status, status message, resource, # priority, # keyID, timestamp, contact_nickname)) @@ -1415,6 +1425,7 @@ 'fingerprint-error': [self.handle_event_fingerprint_error], 'gc-invitation-received': [self.handle_event_gc_invitation], 'gc-presence-received': [self.handle_event_gc_presence], + 'gc-message-received': [self.handle_event_gc_message], 'gmail-notify': [self.handle_event_gmail_notify], 'gpg-password-required': [self.handle_event_gpg_password_required], 'gpg-trust-key': [self.handle_event_gpg_trust_key],

1 0

gajim: close jingle audio/video request window when we click ok/...
by Yann Leboulanger 13 Mar '12

13 Mar '12

changeset c3ca90235f5b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c3ca90235f5b description: close jingle audio/video request window when we click ok/cancel button is seesion has been canceled. Fixes #7119 diffstat: src/dialogs.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 64b17e86c894 -r c3ca90235f5b src/dialogs.py --- a/src/dialogs.py Tue Mar 13 14:32:09 2012 +0100 +++ b/src/dialogs.py Tue Mar 13 14:42:52 2012 +0100 @@ -5159,6 +5159,7 @@ session = gajim.connections[self.account].get_jingle_session(self.fjid, self.sid) if not session: + dialog.destroy() return if response == gtk.RESPONSE_YES: #TODO: Ensure that ctrl.contact.resource == resource

1 0

gajim: [leon] show account name in tooltip rather than in roster...
by Yann Leboulanger 13 Mar '12

13 Mar '12

changeset 64b17e86c894 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=64b17e86c894 description: [leon] show account name in tooltip rather than in roster in merged mode. Fixes #7118 diffstat: src/roster_window.py | 23 ----------------------- src/tooltips.py | 5 +++++ 2 files changed, 5 insertions(+), 23 deletions(-) diffs (48 lines): diff -r c51351d54ac7 -r 64b17e86c894 src/roster_window.py --- a/src/roster_window.py Sun Mar 11 19:38:44 2012 +0100 +++ b/src/roster_window.py Tue Mar 13 14:32:09 2012 +0100 @@ -1163,29 +1163,6 @@ name += i18n.paragraph_direction_mark(unicode(name)) name += u' (%d)' % nb_connected_contact - # show (account_name) if there are 2 contact with same jid - # in merged mode - if self.regroup: - add_acct = False - # look through all contacts of all accounts - for account_ in gajim.connections: - # useless to add account name - if account_ == account: - continue - for jid_ in gajim.contacts.get_jid_list(account_): - contact_ = gajim.contacts.get_first_contact_from_jid( - account_, jid_) - if contact_.get_shown_name() == contact.get_shown_name() \ - and (jid_, account_) != (jid, account): - add_acct = True - break - if add_acct: - # No need to continue in other account - # if we already found one - break - if add_acct: - name += ' (' + account + ')' - # add status msg, if not empty, under contact name in # the treeview if contact.status and gajim.config.get('show_status_msgs_in_roster'): diff -r c51351d54ac7 -r 64b17e86c894 src/tooltips.py --- a/src/tooltips.py Sun Mar 11 19:38:44 2012 +0100 +++ b/src/tooltips.py Tue Mar 13 14:32:09 2012 +0100 @@ -498,6 +498,11 @@ name_markup = u'' + \ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '' + if gajim.config.get('mergeaccounts'): + name_markup += u" (" + \ + gobject.markup_escape_text(prim_contact.account.name) \ + + ')' + if self.account and helpers.jid_is_blocked(self.account, prim_contact.jid): name_markup += _(' [blocked]')

1 0

gajim: fix getting vcard in rooms where JIDs are public
by Yann Leboulanger 12 Mar '12

12 Mar '12

changeset 5295fadc4308 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5295fadc4308 description: fix getting vcard in rooms where JIDs are public diffstat: src/vcard.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (41 lines): diff -r 7a86b478c0ff -r 5295fadc4308 src/vcard.py --- a/src/vcard.py Sat Mar 10 13:32:34 2012 +0100 +++ b/src/vcard.py Sun Mar 11 19:38:44 2012 +0100 @@ -242,7 +242,7 @@ return if obj.resource: # It's a muc occupant vcard - if obj.fjid != self.real_jid: + if obj.fjid != self.contact.jid: return else: if obj.jid != self.contact.jid: @@ -257,11 +257,15 @@ self.update_progressbar_timeout_id = None def set_last_status_time(self, obj): + if obj.conn.name != self.account: + return if obj.fjid != self.real_jid: return self.fill_status_label() def set_os_info(self, obj): + if obj.conn.name != self.account: + return if self.xml.get_object('information_notebook').get_n_pages() < 5: return if obj.fjid != self.real_jid: @@ -291,9 +295,11 @@ self.test_remove_progressbar() def set_entity_time(self, obj): + if obj.conn.name != self.account: + return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.real_jid: + if obj.fjid != self.contact.jid: return i = 0 time_s = ''

1 0

gajim: don't fail to autogen when there is no plugin
by Yann Leboulanger 12 Mar '12

12 Mar '12

changeset 7a86b478c0ff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7a86b478c0ff description: don't fail to autogen when there is no plugin diffstat: autogen.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r a8184901e74a -r 7a86b478c0ff autogen.sh --- a/autogen.sh Mon Mar 12 07:17:06 2012 +0100 +++ b/autogen.sh Sat Mar 10 13:32:34 2012 +0100 @@ -22,8 +22,10 @@ && ls -1 data/gajim.desktop.in.in \ src/*.py src/common/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ - && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip \ - && ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip || exit 1 + && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 + if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then + ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip + fi if test -z `which pkg-config 2>/dev/null`;then echo "***Error: pkg-config not found***" echo "See README.html for build requirements."

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2012