Commits

commits@gajim.org

17632 discussions

gajim: don't try to reconnect when network goes down. See #8062
by Gajim 24 Jul '15

24 Jul '15

changeset 0ac2247611e5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=0ac2247611e5 description: don't try to reconnect when network goes down. See #8062 diffstat: src/network_manager_listener.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (22 lines): diff -r 2400c9bed8bb -r 0ac2247611e5 src/network_manager_listener.py --- a/src/network_manager_listener.py Fri Jul 24 20:47:57 2015 +0200 +++ b/src/network_manager_listener.py Fri Jul 24 20:49:14 2015 +0200 @@ -47,8 +47,7 @@ """ For Network Manager 0.7 - 0.9 """ - nm_state = props.Get("org.freedesktop.NetworkManager", "State") - if nm_state == 3 or nm_state == 70: + if state == 70: for connection in gajim.connections.itervalues(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect: @@ -57,7 +56,7 @@ for connection in gajim.connections.itervalues(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.connected > 1: - connection._disconnectedReconnCB() + connection._on_disconnected() supported = False

1 0

gajim: Make Secrets a subclass of object
by Gajim 24 Jul '15

24 Jul '15

changeset 2400c9bed8bb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2400c9bed8bb description: Make Secrets a subclass of object diffstat: src/secrets.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 461ad0e21512 -r 2400c9bed8bb src/secrets.py --- a/src/secrets.py Mon Jul 20 19:47:30 2015 +0200 +++ b/src/secrets.py Fri Jul 24 20:47:57 2015 +0200 @@ -31,7 +31,7 @@ secrets_filename = gajimpaths['SECRETS_FILE'] secrets_cache = None -class Secrets: +class Secrets(object): def __init__(self, filename): self.filename = filename self.srs = {}

1 0

gajim: fix a few warnings
by Gajim 20 Jul '15

20 Jul '15

changeset bab28241265d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bab28241265d description: fix a few warnings diffstat: src/dialogs.py | 5 ++--- src/gajim.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diffs (39 lines): diff -r 4913f43997e9 -r bab28241265d src/dialogs.py --- a/src/dialogs.py Sat Jul 18 18:10:55 2015 +0200 +++ b/src/dialogs.py Mon Jul 20 20:08:55 2015 +0200 @@ -1420,13 +1420,12 @@ on_response_ok=None, on_response_cancel=None, on_response_yes=None, on_response_no=None): self.call_cancel_on_destroy = True - Gtk.MessageDialog.__init__(self, parent=parent, + Gtk.MessageDialog.__init__(self, transient_for=parent, modal=True, destroy_with_parent=True, message_type=type_, buttons=buttons, text=pritext) self.format_secondary_markup(sectext) - buttons = self.action_area.get_children() self.possible_responses = {Gtk.ResponseType.OK: on_response_ok, Gtk.ResponseType.CANCEL: on_response_cancel, Gtk.ResponseType.YES: on_response_yes, @@ -5486,7 +5485,7 @@ checktext=checktext, on_response_yes=on_response_yes, on_response_no=on_response_no) self.set_title(_('SSL Certificate Verification for %s') % account) - b = Gtk.Button(_('View cert...')) + b = Gtk.Button(label=_('View cert...')) b.connect('clicked', self.on_cert_clicked) b.show_all() area = self.get_action_area() diff -r 4913f43997e9 -r bab28241265d src/gajim.py --- a/src/gajim.py Sat Jul 18 18:10:55 2015 +0200 +++ b/src/gajim.py Mon Jul 20 20:08:55 2015 +0200 @@ -226,7 +226,7 @@ sys.stderr = MyStderr() # PyGTK2.10+ only throws a warning -warnings.filterwarnings('error', module='gtk') +warnings.filterwarnings('error', module='Gtk') try: from gi.repository import GObject GObject.set_prgname('gajim')

1 0

gajim: require python-nbxmpp 0.5.3
by Gajim 20 Jul '15

20 Jul '15

changeset 461ad0e21512 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=461ad0e21512 description: require python-nbxmpp 0.5.3 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7947c48a72a3 -r 461ad0e21512 src/gajim.py --- a/src/gajim.py Mon Jul 20 18:14:38 2015 +0200 +++ b/src/gajim.py Mon Jul 20 19:47:30 2015 +0200 @@ -69,7 +69,7 @@ pass HAS_NBXMPP=True -MIN_NBXMPP_VER = "0.5.2" +MIN_NBXMPP_VER = "0.5.3" try: import nbxmpp except ImportError:

1 0

gajim: fix charset issue when printing time. Fixes #8037
by Gajim 20 Jul '15

20 Jul '15

changeset 7947c48a72a3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7947c48a72a3 description: fix charset issue when printing time. Fixes #8037 diffstat: src/conversation_textview.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diffs (14 lines): diff -r 406b2dc73190 -r 7947c48a72a3 src/conversation_textview.py --- a/src/conversation_textview.py Sun Jul 19 00:03:32 2015 +0200 +++ b/src/conversation_textview.py Mon Jul 20 18:14:38 2015 +0200 @@ -1393,10 +1393,6 @@ timestamp_str = helpers.from_one_line(timestamp_str) format_ += timestamp_str tim_format = time.strftime(format_, tim) - if locale.getpreferredencoding() not in ('KOI8-R', 'cp1251'): - # if tim_format comes as unicode because of day_str. - # we convert it to the encoding that we want (and that is utf-8) - tim_format = helpers.ensure_utf8_string(tim_format) return tim_format def detect_other_text_tag(self, text, kind):

1 0

gajim: fix ipython usage
by Gajim 18 Jul '15

18 Jul '15

changeset 406b2dc73190 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=406b2dc73190 description: fix ipython usage diffstat: src/ipython_view.py | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) diffs (111 lines): diff -r 05c09cbb1ecf -r 406b2dc73190 src/ipython_view.py --- a/src/ipython_view.py Fri Jul 17 22:19:16 2015 +0200 +++ b/src/ipython_view.py Sun Jul 19 00:03:32 2015 +0200 @@ -89,23 +89,23 @@ @param input_func: Replacement for builtin raw_input() @type input_func: function """ + io = IPython.utils.io if input_func: if IPython.version_info[0] >= 1: IPython.terminal.interactiveshell.raw_input_original = input_func else: IPython.frontend.terminal.interactiveshell.raw_input_original = input_func if cin: - IPython.utils.io.stdin = IPython.utils.io.IOStream(cin) + io.stdin = io.IOStream(cin) if cout: - IPython.utils.io.stdout = IPython.utils.io.IOStream(cout) + io.stdout = io.IOStream(cout) if cerr: - IPython.utils.io.stderr = IPython.utils.io.IOStream(cerr) + io.stderr = io.IOStream(cerr) # This is to get rid of the blockage that accurs during # IPython.Shell.InteractiveShell.user_setup() - IPython.utils.io.raw_input = lambda x: None + io.raw_input = lambda x: None - self.term = IPython.utils.io.IOTerm(stdin=cin, stdout=cout, stderr=cerr) os.environ['TERM'] = 'dumb' excepthook = sys.excepthook @@ -113,10 +113,19 @@ cfg = Config() cfg.InteractiveShell.colors = "Linux" + # InteractiveShell's __init__ overwrites io.stdout,io.stderr with + # sys.stdout, sys.stderr, this makes sure they are right + old_stdout, old_stderr = sys.stdout, sys.stderr + sys.stdout, sys.stderr = io.stdout.stream, io.stderr.stream + + # InteractiveShell inherits from SingletonConfigurable so use instance() if IPython.version_info[0] >= 1: - self.IP = IPython.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) + self.IP = IPython.terminal.embed.InteractiveShellEmbed.instance(config=cfg, user_ns=user_ns) else: - self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) + self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed.instance(config=cfg, user_ns=user_ns) + + sys.stdout, sys.stderr = old_stdout, old_stderr + self.IP.system = lambda cmd: self.shell(self.IP.var_expand(cmd), header='IPython system call: ', local_ns=user_ns) @@ -149,7 +158,7 @@ """ self.history_level = 0 orig_stdout = sys.stdout - sys.stdout = self.term.stdout + sys.stdout = IPython.utils.io.stdout orig_stdin = sys.stdin sys.stdin = IPython.utils.io.stdin; @@ -179,12 +188,16 @@ self.IP.autoedit_syntax): self.IP.edit_syntax_error() if not self.iter_more: - source_raw = self.IP.input_splitter.source_raw_reset()[1] + if IPython.version_info[0] >= 2: + source_raw = self.IP.input_splitter.raw_reset() + else: + source_raw = self.IP.input_splitter.source_raw_reset()[1] self.IP.run_cell(source_raw, store_history=True) + self.IP.rl_do_indent = False else: # TODO: Auto-indent # - pass + self.IP.rl_do_indent = True sys.stdout = orig_stdout sys.stdin = orig_stdin @@ -469,6 +482,10 @@ self.text_buffer.move_mark(self.line_start, self.text_buffer.get_end_iter()) self.text_buffer.place_cursor(self.text_buffer.get_end_iter()) + if self.IP.rl_do_indent: + indentation = self.IP.input_splitter.indent_spaces * ' ' + self.text_buffer.insert_at_cursor(indentation) + def onKeyPress(self, widget, event): """ Key press callback used for correcting behavior for console-like @@ -534,11 +551,11 @@ IterableIPShell.__init__(self, cout=self.cout, cerr=self.cout, input_func=self.raw_input) # self.connect('key_press_event', self.keyPress) + self.interrupt = False self.execute() self.prompt = self.generatePrompt(False) self.cout.truncate(0) self.showPrompt(self.prompt) - self.interrupt = False def raw_input(self, prompt=''): """ @@ -604,3 +621,4 @@ if rv: rv = rv.strip('\n') self.showReturned(rv) self.cout.truncate(0) + self.cout.seek(0)

1 0

gajim: fix decoding issue
by Gajim 18 Jul '15

18 Jul '15

changeset 4913f43997e9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4913f43997e9 description: fix decoding issue diffstat: src/common/jingle_xtls.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 9701d2ecfe10 -r 4913f43997e9 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Sat Jul 18 17:53:48 2015 +0200 +++ b/src/common/jingle_xtls.py Sat Jul 18 18:10:55 2015 +0200 @@ -194,7 +194,8 @@ cert = load_cert_file(certpath) if cert: try: - digest_algo = cert.get_signature_algorithm().split('With')[0] + digest_algo = cert.get_signature_algorithm().decode('utf-8').\ + split('With')[0] except AttributeError as e: # Old py-OpenSSL is missing get_signature_algorithm digest_algo = "sha256"

1 0

gajim: fix showing FileTransferChooser dialog
by Gajim 18 Jul '15

18 Jul '15

changeset 9701d2ecfe10 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9701d2ecfe10 description: fix showing FileTransferChooser dialog diffstat: src/dialogs.py | 4 ++-- src/filetransfers_window.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diffs (27 lines): diff -r bf80e3e456cd -r 9701d2ecfe10 src/dialogs.py --- a/src/dialogs.py Sat Jul 18 17:27:50 2015 +0200 +++ b/src/dialogs.py Sat Jul 18 17:53:48 2015 +0200 @@ -1478,8 +1478,8 @@ select_multiple=False, current_folder=None, on_response_ok=None, on_response_cancel=None, transient_for=None): - GObject.GObject.__init__(self, title=title_text, parent=transient_for, - action=action) + Gtk.FileChooserDialog.__init__(self, title=title_text, + parent=transient_for, action=action) self.add_button(buttons[0],buttons[1]) if len(buttons) ==4: self.add_button(buttons[2],buttons[3]) diff -r bf80e3e456cd -r 9701d2ecfe10 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Jul 18 17:27:50 2015 +0200 +++ b/src/filetransfers_window.py Sat Jul 18 17:53:48 2015 +0200 @@ -316,7 +316,8 @@ True, # select multiple true as we can select many files to send gajim.config.get('last_send_dir'), on_response_ok=on_ok, - on_response_cancel=lambda e:dialog.destroy() + on_response_cancel=lambda e:dialog.destroy(), + transient_for=gajim.interface.roster.window ) btn = Gtk.Button.new_with_mnemonic(_('_Send'))

1 0

gajim: remove deprecated "reparent" call
by Gajim 18 Jul '15

18 Jul '15

changeset 0b29adf4d481 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0b29adf4d481 description: remove deprecated "reparent" call diffstat: src/message_window.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r e8d44379f2de -r 0b29adf4d481 src/message_window.py --- a/src/message_window.py Sat Jul 18 15:52:08 2015 +0200 +++ b/src/message_window.py Sat Jul 18 16:00:57 2015 +0200 @@ -84,7 +84,9 @@ orig_window = self.window self.window = parent_window self.parent_paned = parent_paned - self.notebook.reparent(self.parent_paned) + old_parent = self.notebook.get_parent() + old_parent.remove(self.notebook) + self.parent_paned.add(self.notebook) self.parent_paned.pack2(self.notebook, resize=True, shrink=True) gajim.interface.roster.xml.get_object('show_roster_menuitem').\ set_sensitive(True)

1 0

gajim: fix a few warnings
by Gajim 18 Jul '15

18 Jul '15

changeset bf80e3e456cd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bf80e3e456cd description: fix a few warnings diffstat: src/common/jingle_xtls.py | 11 ++++++----- src/dialogs.py | 4 ++-- src/filetransfers_window.py | 7 +++---- src/groupchat_control.py | 4 ++-- src/roster_window.py | 14 ++++++++------ src/tooltips.py | 2 +- 6 files changed, 22 insertions(+), 20 deletions(-) diffs (142 lines): diff -r 0b29adf4d481 -r bf80e3e456cd src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Sat Jul 18 16:00:57 2015 +0200 +++ b/src/common/jingle_xtls.py Sat Jul 18 17:27:50 2015 +0200 @@ -83,6 +83,7 @@ OpenSSL.crypto.FILETYPE_PEM, cert) if cert_store: cert_store.add_cert(x509cert) + f.close() return x509cert except OpenSSL.crypto.Error as exception_obj: log.warning('Unable to load a certificate from file %s: %s' %\ @@ -119,14 +120,14 @@ dh_params_name = os.path.join(gajim.MY_CERT_DIR, DH_PARAMS) try: with open(dh_params_name, "r") as dh_params_file: - ctx.load_tmp_dh(str(dh_params_name).encode('utf-8')) - except IOError as err: - default_dh_params_name = os.path.join(common.gajim.DATA_DIR, + ctx.load_tmp_dh(str(dh_params_name)) + except FileNotFoundError as err: + default_dh_params_name = os.path.join(gajim.DATA_DIR, 'other', DEFAULT_DH_PARAMS) try: with open(default_dh_params_name, "r") as default_dh_params_file: - ctx.load_tmp_dh(str(default_dh_params_name).encode('utf-8')) - except IOError as err: + ctx.load_tmp_dh(str(default_dh_params_name)) + except FileNotFoundError as err: log.error('Unable to load default DH parameter file: %s , %s' % (default_dh_params_name, err)) raise diff -r 0b29adf4d481 -r bf80e3e456cd src/dialogs.py --- a/src/dialogs.py Sat Jul 18 16:00:57 2015 +0200 +++ b/src/dialogs.py Sat Jul 18 17:27:50 2015 +0200 @@ -384,7 +384,7 @@ else: rbtns[act] = group = Gtk.RadioButton() - hbox = Gtk.HBox(False, 5) + hbox = Gtk.HBox(homogeneous=False, spacing=5) hbox.pack_start(gtkgui_helpers.load_activity_icon(category, activity), False, False, 0) lbl = Gtk.Label(label='' + pep.ACTIVITIES[category]['category'] \ @@ -412,7 +412,7 @@ else: rbtns[act] = group = Gtk.RadioButton() - hbox = Gtk.HBox(False, 5) + hbox = Gtk.HBox(homogeneous=False, spacing=5) hbox.pack_start(gtkgui_helpers.load_activity_icon(category, activity), False, False, 0) hbox.pack_start(Gtk.Label(pep.ACTIVITIES[category][activity]), diff -r 0b29adf4d481 -r bf80e3e456cd src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Jul 18 16:00:57 2015 +0200 +++ b/src/filetransfers_window.py Sat Jul 18 17:27:50 2015 +0200 @@ -325,8 +325,8 @@ dialog.add_action_widget(btn, Gtk.ResponseType.OK) dialog.set_default_response(Gtk.ResponseType.OK) - desc_hbox = Gtk.HBox(False, 5) - desc_hbox.pack_start(Gtk.Label(_('Description: ')), False, False, 0) + desc_hbox = Gtk.HBox(homogeneous=False, spacing=5) + desc_hbox.pack_start(Gtk.Label.new(_('Description: ')), False, False, 0) desc_hbox.pack_start(win, True, True, 0) dialog.vbox.pack_start(desc_hbox, False, False, 0) @@ -474,8 +474,7 @@ def get_icon(self, ident): return self.images.setdefault(ident, - self.window.render_icon_pixbuf(self.icons[ident], - Gtk.IconSize.MENU)) + gtkgui_helpers.get_icon_pixmap(self.icons[ident], 24)) def set_status(self,file_props, status): """ diff -r 0b29adf4d481 -r bf80e3e456cd src/groupchat_control.py --- a/src/groupchat_control.py Sat Jul 18 16:00:57 2015 +0200 +++ b/src/groupchat_control.py Sat Jul 18 17:27:50 2015 +0200 @@ -1523,8 +1523,8 @@ # escape markup entities and make them small italic and fg color color = gtkgui_helpers.get_fade_color(self.list_treeview, selected, focus) - colorstring = "#%04x%04x%04x" % (color.red, color.green, - color.blue) + colorstring = "#%04x%04x%04x" % (int(color.red * 65535), + int(color.green * 65535), int(color.blue * 65535)) name += ('\n' '%s') % (colorstring, GLib.markup_escape_text( status)) diff -r 0b29adf4d481 -r bf80e3e456cd src/roster_window.py --- a/src/roster_window.py Sat Jul 18 16:00:57 2015 +0200 +++ b/src/roster_window.py Sat Jul 18 17:27:50 2015 +0200 @@ -261,9 +261,10 @@ tls_pixbuf = None if gajim.account_is_securely_connected(account): + tls_pixbuf = gtkgui_helpers.get_icon_pixmap('gtk-dialog-authentication', 24) # the only way to create a pixbuf from stock - tls_pixbuf = self.window.render_icon_pixbuf( - Gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.IconSize.MENU) +# tls_pixbuf = self.window.render_icon_pixbuf( +# Gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.IconSize.MENU) it = self.model.append(None, [ gajim.interface.jabber_state_images['16'][show], @@ -1041,9 +1042,10 @@ if gajim.account_is_securely_connected(account) and not self.regroup or\ self.regroup and num_of_secured and num_of_secured == num_of_accounts: + tls_pixbuf = gtkgui_helpers.get_icon_pixmap('gtk-dialog-authentication', 24) # the only way to create a pixbuf from stock - tls_pixbuf = self.window.render_icon_pixbuf( - Gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.IconSize.MENU) +# tls_pixbuf = self.window.render_icon_pixbuf( +# Gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.IconSize.MENU) self.model[child_iter][C_PADLOCK_PIXBUF] = tls_pixbuf else: self.model[child_iter][C_PADLOCK_PIXBUF] = empty_pixbuf @@ -1226,8 +1228,8 @@ # always readable color = gtkgui_helpers.get_fade_color(self.tree, selected, focus) - colorstring = '#%04x%04x%04x' % (color.red, color.green, - color.blue) + colorstring = '#%04x%04x%04x' % (int(color.red * 65535), + int(color.green * 65535), int(color.blue * 65535)) name += '\n%s' % (colorstring, GLib.markup_escape_text(status)) diff -r 0b29adf4d481 -r bf80e3e456cd src/tooltips.py --- a/src/tooltips.py Sat Jul 18 16:00:57 2015 +0200 +++ b/src/tooltips.py Sat Jul 18 17:27:50 2015 +0200 @@ -86,7 +86,7 @@ """ Create a popup window each time tooltip is requested """ - self.win = Gtk.Window(Gtk.WindowType.POPUP) + self.win = Gtk.Window.new(Gtk.WindowType.POPUP) self.win.set_title('tooltip') self.win.set_border_width(3) self.win.set_resizable(False)

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