Commits February 2018

commits@gajim.org

1 participants
76 discussions

[Git][gajim/gajim][master] Convert xmpp uris not to GFiles
by Philipp Hörist 06 Feb '18

06 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e830475 by Philipp Hörist at 2018-02-06T20:41:24+01:00 Convert xmpp uris not to GFiles We dont need to use the ::open handler to handle xmpp uris - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -102,7 +102,6 @@ class GajimApplication(Gtk.Application): self.connect('command-line', self._handle_remote_options) self.connect('startup', self._startup) self.connect('activate', self._activate) - self.connect('open', self._open) self.profile = '' self.config_path = None @@ -250,10 +249,9 @@ class GajimApplication(Gtk.Application): from gajim import gui_menu_builder gui_menu_builder.build_accounts_menu() - def _open(self, application, file, hint, *args): + def _open_uris(self, uris): from gajim.common import app - for arg in file: - uri = arg.get_uri() + for uri in uris: app.log('uri_handler').info('open %s', uri) if not uri.startswith('xmpp:'): continue @@ -297,22 +295,19 @@ class GajimApplication(Gtk.Application): self.activate_action('ipython') return 0 - gfiles = self._parse_file_args(command_line) - if gfiles is not None: - self.open(gfiles, '') + uri = self._parse_uris(command_line) + if uri is not None: + self._open_uris(uri) return 0 self.activate() return 0 @staticmethod - def _parse_file_args(command_line): + def _parse_uris(command_line): args = command_line.get_arguments() if len(args) > 1: - gfiles = [] - for arg in args[1:]: - gfiles.append(command_line.create_file_for_arg(arg)) - return gfiles + return args[1:] def _handle_local_options(self, application, options: GLib.VariantDict) -> int: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e8304755fde705750bcac3b1101589b0a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e8304755fde705750bcac3b1101589b0a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add Gajim version to exception output
by Philipp Hörist 05 Feb '18

05 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f3a3211 by Philipp Hörist at 2018-02-05T21:00:28+01:00 Add Gajim version to exception output - - - - - 1 changed file: - gajim/gtkexcepthook.py Changes: ===================================== gajim/gtkexcepthook.py ===================================== --- a/gajim/gtkexcepthook.py +++ b/gajim/gtkexcepthook.py @@ -31,6 +31,7 @@ from io import StringIO from urllib.parse import urlencode import nbxmpp +import gajim import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GObject @@ -49,6 +50,7 @@ ISSUE_TEXT = '''## Versions - GTK+ Version: {} - PyGObject Version: {} - python-nbxmpp Version: {} +- Gajim Version: {} ## Traceback ``` @@ -104,6 +106,7 @@ class ExceptionDialog(): gtk_ver, gobject_ver, nbxmpp.__version__, + gajim.__version__, traceback_text) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f3a321112cf5f49bba50891d6d4279f00… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f3a321112cf5f49bba50891d6d4279f00… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix StartChatDialog
by Philipp Hörist 05 Feb '18

05 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a65f4ae by Philipp Hörist at 2018-02-05T20:55:48+01:00 Fix StartChatDialog Fixes #8881 - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2836,8 +2836,8 @@ class StartChatDialog(Gtk.ApplicationWindow): for jid in groupchats: name = groupchats[jid] - if name is None: - name = app.get_nick_from_jid(groupchats[jid]) + if not name: + name = app.get_nick_from_jid(jid) row = ContactRow(account, None, jid, name, show_account, True) self.listbox.add(row) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4a65f4aeae70717494d5824a19bac454af… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4a65f4aeae70717494d5824a19bac454af… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Correctly handle cmdline args for remote instance
by Philipp Hörist 03 Feb '18

03 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d8020f18 by Philipp Hörist at 2018-02-03T09:36:21+01:00 Correctly handle cmdline args for remote instance - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -62,7 +62,10 @@ class GajimApplication(Gtk.Application): def __init__(self): Gtk.Application.__init__(self, application_id='org.gajim.Gajim', - flags=Gio.ApplicationFlags.HANDLES_OPEN) + flags=( + Gio.ApplicationFlags.HANDLES_COMMAND_LINE | + Gio.ApplicationFlags.HANDLES_OPEN | + Gio.ApplicationFlags.CAN_OVERRIDE_APP_ID)) self.add_main_option('version', ord('V'), GLib.OptionFlags.NONE, GLib.OptionArg.NONE, @@ -96,6 +99,7 @@ class GajimApplication(Gtk.Application): _('open ipython shell')) self.connect('handle-local-options', self._handle_local_options) + self.connect('command-line', self._handle_remote_options) self.connect('startup', self._startup) self.connect('activate', self._activate) self.connect('open', self._open) @@ -285,9 +289,34 @@ class GajimApplication(Gtk.Application): from gajim.common import app app.logger.commit() + def _handle_remote_options(self, application, command_line): + # Parse all options that should be executed on a remote instance + options = command_line.get_options_dict() + + if options.contains('ipython'): + self.activate_action('ipython') + return 0 + + gfiles = self._parse_file_args(command_line) + if gfiles is not None: + self.open(gfiles, '') + return 0 + + self.activate() + return 0 + + @staticmethod + def _parse_file_args(command_line): + args = command_line.get_arguments() + if len(args) > 1: + gfiles = [] + for arg in args[1:]: + gfiles.append(command_line.create_file_for_arg(arg)) + return gfiles + def _handle_local_options(self, application, options: GLib.VariantDict) -> int: - + # Parse all options that have to be executed before ::startup logging_helpers.init() if options.contains('profile'): @@ -297,11 +326,6 @@ class GajimApplication(Gtk.Application): app_id = '%s.%s' % (self.get_application_id(), profile) self.set_application_id(app_id) self.profile = profile - - # Register the Application, so it knows if its primary or not - # This is needed so we can execute actions on the remote instance - self.register(None) - if options.contains('separate'): self.profile_separation = True if options.contains('config-path'): @@ -319,9 +343,7 @@ class GajimApplication(Gtk.Application): logging_helpers.set_loglevels(loglevel) if options.contains('warnings'): self.show_warnings() - if options.contains('ipython'): - self.activate_action('ipython') - return 0 + return -1 def show_warnings(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d8020f18a1df1c1b6d9dd14c36b329ec0f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d8020f18a1df1c1b6d9dd14c36b329ec0f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Port ipython command from gajim-remote
by Philipp Hörist 01 Feb '18

01 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9ed0edf3 by Philipp Hörist at 2018-02-02T00:21:27+01:00 Port ipython command from gajim-remote - - - - - 2 changed files: - gajim/app_actions.py - gajim/gajim.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -274,3 +274,15 @@ class AppActions(): app.interface.handle_event(dict_['account'], dict_['jid'], dict_['type_']) + + # Other Actions + + def toggle_ipython(self, action, param): + """ + Show/hide the ipython window + """ + win = app.ipython_window + if win and win.window.is_visible(): + win.present() + else: + app.interface.create_ipython_window() ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -91,6 +91,9 @@ class GajimApplication(Gtk.Application): self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE, GLib.OptionArg.NONE, _('Show all warnings')) + self.add_main_option('ipython', ord('i'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('open ipython shell')) self.connect('handle-local-options', self._handle_local_options) self.connect('startup', self._startup) @@ -294,6 +297,11 @@ class GajimApplication(Gtk.Application): app_id = '%s.%s' % (self.get_application_id(), profile) self.set_application_id(app_id) self.profile = profile + + # Register the Application, so it knows if its primary or not + # This is needed so we can execute actions on the remote instance + self.register(None) + if options.contains('separate'): self.profile_separation = True if options.contains('config-path'): @@ -311,6 +319,9 @@ class GajimApplication(Gtk.Application): logging_helpers.set_loglevels(loglevel) if options.contains('warnings'): self.show_warnings() + if options.contains('ipython'): + self.activate_action('ipython') + return 0 return -1 def show_warnings(self): @@ -386,6 +397,7 @@ class GajimApplication(Gtk.Application): ('content', action.on_contents), ('about', action.on_about), ('faq', action.on_faq), + ('ipython', action.toggle_ipython), ] act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9ed0edf331e8163529ebe26eca3c588da0… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9ed0edf331e8163529ebe26eca3c588da0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Update flatpak file
by Yann Leboulanger 01 Feb '18

01 Feb '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 9aec93b8 by André Apitzsch at 2018-02-01T00:56:56+01:00 Update flatpak file - - - - - aec3a6df by Yann Leboulanger at 2018-02-01T07:52:09+01:00 Merge branch 'update_flatpak' into 'master' Update flatpak file See merge request gajim/gajim!204 - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -58,8 +58,8 @@ "sources": [ { "type": "archive", - "url": "https://pypi.python.org/packages/4e/32/4070bdf32812c89eb635c80880a5caa2e018…", - "sha256": "5f4ff33371c6969b39b293d9771ee91e81d26f9129be093ca1b7be357fcefd15" + "url": "https://pypi.python.org/packages/62/ea/f41d44e0a4222fe8317ffe1fe7a5c75ec71c…", + "sha256": "8456abb0f892eb7d545f9ce94f4ba78d651365b1a59f9ce9ae7b5325a95dc698" } ] }, @@ -132,8 +132,8 @@ "sources": [ { "type": "archive", - "url": "https://pypi.python.org/packages/a4/c8/9a7a47f683d54d83f648d37c3e180317f80d…", - "sha256": "ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64" + "url": "https://pypi.python.org/packages/41/5f/6da80400340fd48ba4ae1c673be4dc3821ac…", + "sha256": "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75" } ] }, @@ -141,13 +141,13 @@ "name": "python3-asn1crypto", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app asn1crypto-0.23.0-py2.py3-none-any.whl" + "pip3 install --prefix=/app asn1crypto-0.24.0-py2.py3-none-any.whl" ], "sources": [ { "type": "file", - "url": "https://pypi.python.org/packages/5e/85/d9b46c307ff2b5504432425cd99e2d9f13ab…", - "sha256": "654b7db3b120e23474e9a1e5e38d268c77e58a9e17d2cb595456c37309846494" + "url": "https://pypi.python.org/packages/ea/cd/35485615f45f30a510576f1a56d1e0a7ad7b…", + "sha256": "2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87" } ] }, @@ -177,8 +177,8 @@ "sources": [ { "type": "archive", - "url": "https://pypi.python.org/packages/9c/1a/0fc8cffb04582f9ffca61b15b0681cf2e858…", - "sha256": "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a" + "url": "https://pypi.python.org/packages/78/c5/7188f15a92413096c93053d5304718e1f6ba…", + "sha256": "e4d967371c5b6b2e67855066471d844c5d52d210c36c28d49a8507b96e2c5291" } ] }, @@ -186,13 +186,13 @@ "name": "python3-pyopenssl", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app pyOpenSSL-17.3.0-py2.py3-none-any.whl" + "pip3 install --prefix=/app pyOpenSSL-17.5.0-py2.py3-none-any.whl" ], "sources": [ { "type": "file", - "url": "https://pypi.python.org/packages/24/37/89bf12e53f1d27e8b2c8e5f8f9c7a958a390…", - "sha256": "aade9985b93eaec51b0c0a2a60d14bb8dcff1ff8e36fe542e3c22812ec07315e" + "url": "https://pypi.python.org/packages/79/db/7c0cfe4aa8341a5fab4638952520d8db6ab8…", + "sha256": "07a2de1a54de07448732a81e38a55df7da109b2f47f599f8bb35b0cbec69d4bd" } ] }, @@ -200,13 +200,13 @@ "name": "python3-pyasn1", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app pyasn1-0.3.6-py2.py3-none-any.whl" + "pip3 install --prefix=/app pyasn1-0.4.2-py2.py3-none-any.whl" ], "sources": [ { "type": "file", - "url": "https://pypi.python.org/packages/bf/56/47712763865a8639e6634e80405f6c758d44…", - "sha256": "06afc633971ab80943f06b96d3d6314f461001c92418fc0cd682a8357a1db47f" + "url": "https://pypi.python.org/packages/ba/fe/02e3e2ee243966b143657fb8bd6bc9759584…", + "sha256": "d5cd6ed995dba16fad0c521cfe31cd2d68400b53fcc2bce93326829be73ab6d1" } ] }, @@ -281,7 +281,7 @@ { "type": "git", "url": "https://dev.gajim.org/gajim/python-nbxmpp.git", - "branch": "nbxmpp-0.6.0" + "branch": "nbxmpp-0.6.2" } ] }, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/258c7922a585b171abecbe77b12173b2f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/258c7922a585b171abecbe77b12173b2f… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2018