Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Raise nbxmpp min version
by Philipp Hörist 17 Mar '18

17 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 368a2177 by Philipp Hörist at 2018-03-17T17:57:27+01:00 Raise nbxmpp min version - - - - - 788c064c by Philipp Hörist at 2018-03-17T17:59:04+01:00 Update Gajim version to 1.0.0 - - - - - 3 changed files: - gajim/__init__.py - gajim/gajim.py - setup.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "0.99.2" +__version__ = "1.0.0" try: p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -56,7 +56,7 @@ from gajim.common import i18n from gajim.common import logging_helpers from gajim.common import crypto -MIN_NBXMPP_VER = "0.6.3" +MIN_NBXMPP_VER = "0.6.4" MIN_GTK_VER = "3.20.0" ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -260,7 +260,7 @@ setup( package_data={'gajim': package_data}, data_files=data_files, install_requires=[ - 'nbxmpp>=0.6.3', + 'nbxmpp>=0.6.4', 'pyOpenSSL>=0.12', 'pyasn1', ], View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/47f0836567c3d7e680025730316d8d80d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/47f0836567c3d7e680025730316d8d80d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 4 commits: Update ChangeLog
by Philipp Hörist 17 Mar '18

17 Mar '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 3db5e027 by Philipp Hörist at 2018-03-17T17:39:32+01:00 Update ChangeLog - - - - - f83cdf69 by Philipp Hörist at 2018-03-17T17:48:57+01:00 Port show-next-pending-event from gajim-remote Delete some already ported methods - - - - - 2b2f1687 by Philipp Hörist at 2018-03-17T17:49:24+01:00 Add --start-chat command - - - - - 78c04169 by Philipp Hörist at 2018-03-17T17:50:17+01:00 Add [URI...] to commandline --help - - - - - 6 changed files: - ChangeLog - gajim/app_actions.py - gajim/dialogs.py - gajim/gajim.py - gajim/gajim_remote.py - gajim/remote_control.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,33 +1,10 @@ -Gajim 1.0.0 (15 March 2018) - - * Add support for geo: URIs - * More improvements for HiDPI Screens - * Fixed various MAM related issues - * Various other small bugfixes - -Gajim 0.99.2 (17 February 2018) - - * Speed up DB querys on MAM sync - * Fix config file encoding - * Bug fixes +Gajim 1.0.0 (17 March 2018) -Gajim 0.99.1 (08 February 2018) - + * Ported to GTK3 / Python3 * Integrate HTTPUpload * Add Navigation buttons in History Window - * Added XEP-0368 (SRV records for XMPP over TLS) * Improvements for HiDPI Screens - * Move Chat Menu button so we are not forced to use CSD * Depend on the python keyring package for password storage - * Bug fixes - -Gajim 0.98.2 (17 December 2017) - - * Fix DB migration - -Gajim 0.98.1 (15 December 2017) - - * Ported to GTK3 / Python3 * Flatpak support * Lots of refactoring * New Emoji support @@ -40,14 +17,22 @@ Gajim 0.98.1 (15 December 2017) * Added mam:1 and mam:2 support (mam:0 was removed) * Added MAM for MUCs support * Added support for showing XEP-0084 Avatars + * Add support for geo: URIs * Added xmpp URI handling directly in Gajim * Removed Gajim-Remote * Removed XEP-0012 (Last Activity) * Removed XEP-0136 (Message Archiving) * Added XEP-0156 (Discovering Alternative XMPP Connection Methods) * Added XEP-0319 (Last User Interaction in Presence) + * Added XEP-0368 (SRV records for XMPP over TLS) * Added XEP-0380 (Explicit Message Encryption) * Added Jingle FT:5 support + * Lots of other small bugfixes + + KNOWN ISSUES: + + - Meta Contacts: Filtering the roster could lead to a crash in some circumstances. Use CTRL + N for starting new chats as a workaround + - Audio/Video support is currently not maintained and most likely not working Gajim 0.16.9 (30 November 2017) ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -286,3 +286,13 @@ class AppActions(): win.present() else: app.interface.create_ipython_window() + + def show_next_pending_event(self, action, param): + """ + Show the window(s) with next pending event in tabbed/group chats + """ + if app.events.get_nb_events(): + account, jid, event = app.events.get_first_systray_event() + if not event: + return + app.interface.handle_event(account, jid, event.type_) ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2755,19 +2755,10 @@ class SynchroniseSelectContactsDialog: class StartChatDialog(Gtk.ApplicationWindow): def __init__(self): - # Must be before ApplicationWindow.__init__ - # or we get our own window - active_window = app.app.get_active_window() - Gtk.ApplicationWindow.__init__(self) self.set_name('StartChatDialog') self.set_application(app.app) - mode = app.config.get('one_message_window') != 'always_with_roster' - if active_window == app.interface.roster.window and mode: - self.set_position(Gtk.WindowPosition.CENTER) - else: - self.set_transient_for(active_window) - self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('Start new Conversation')) self.set_default_size(-1, 400) ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -98,7 +98,15 @@ class GajimApplication(Gtk.Application): _('Show all warnings')) self.add_main_option('ipython', ord('i'), GLib.OptionFlags.NONE, GLib.OptionArg.NONE, - _('open ipython shell')) + _('Open IPython shell')) + self.add_main_option('show-next-pending-event', 0, GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Pops up a window with the next pending event')) + self.add_main_option('start-chat', 0, GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Start a new chat')) + + self.add_main_option_entries(self._get_remaining_entry()) self.connect('handle-local-options', self._handle_local_options) self.connect('command-line', self._handle_remote_options) @@ -114,6 +122,17 @@ class GajimApplication(Gtk.Application): if GLib.get_application_name() != 'Gajim': GLib.set_application_name('Gajim') + @staticmethod + def _get_remaining_entry(): + option = GLib.OptionEntry() + option.arg = GLib.OptionArg.STRING_ARRAY + option.arg_data = None + option.arg_description = ('[URI …]') + option.flags = GLib.OptionFlags.NONE + option.long_name = GLib.OPTION_REMAINING + option.short_name = 0 + return [option] + def _startup(self, application): from gajim import gtkexcepthook gtkexcepthook.init() @@ -301,24 +320,26 @@ class GajimApplication(Gtk.Application): # 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 + remote_commands = ['ipython', + 'show-next-pending-event', + 'start-chat', + ] + + remaining = options.lookup_value(GLib.OPTION_REMAINING, + GLib.VariantType.new('as')) + + for cmd in remote_commands: + if options.contains(cmd): + self.activate_action(cmd) + return 0 - uri = self._parse_uris(command_line) - if uri is not None: - self._open_uris(uri) + if remaining is not None: + self._open_uris(remaining.unpack()) return 0 self.activate() return 0 - @staticmethod - def _parse_uris(command_line): - args = command_line.get_arguments() - if len(args) > 1: - return args[1:] - def _handle_local_options(self, application, options: GLib.VariantDict) -> int: # Parse all options that have to be executed before ::startup @@ -425,6 +446,7 @@ class GajimApplication(Gtk.Application): ('about', action.on_about), ('faq', action.on_faq), ('ipython', action.toggle_ipython), + ('show-next-pending-event', action.show_next_pending_event), ] act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) ===================================== gajim/gajim_remote.py ===================================== --- a/gajim/gajim_remote.py +++ b/gajim/gajim_remote.py @@ -85,14 +85,6 @@ class GajimRemote: _('show help on command'), False) ] ], - 'toggle_roster_appearance': [ - _('Shows or hides the roster window'), - [] - ], - 'show_next_pending_event': [ - _('Pops up a window with the next pending event'), - [] - ], 'list_contacts': [ _('Lists all contacts in roster, one for each line'), [ @@ -257,10 +249,6 @@ class GajimRemote: _('Check if Gajim is running'), [] ], - 'toggle_ipython': [ - _('Shows or hides the ipython window'), - [] - ], } ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -646,50 +646,6 @@ class SignalObject(dbus.service.Object): result.append(item) return result - @dbus.service.method(INTERFACE, in_signature='', out_signature='') - def toggle_roster_appearance(self): - """ - Show/hide the roster window - """ - win = app.interface.roster.window - if win.get_property('visible'): - GLib.idle_add(win.hide) - else: - win.present() - # preserve the 'steal focus preservation' - if self._is_first(): - win.window.present() - else: - win.window.present_with_time(int(time())) - - @dbus.service.method(INTERFACE, in_signature='', out_signature='') - def show_roster(self): - """ - Show the roster window - """ - win = app.interface.roster.window - win.present() - # preserve the 'steal focus preservation' - if self._is_first(): - win.window.present() - else: - win.window.present_with_time(int(time())) - - @dbus.service.method(INTERFACE, in_signature='', out_signature='') - def toggle_ipython(self): - """ - Show/hide the ipython window - """ - win = app.ipython_window - if win: - if win.window.is_visible(): - GLib.idle_add(win.hide) - else: - win.show_all() - win.present() - else: - app.interface.create_ipython_window() - @dbus.service.method(INTERFACE, in_signature='', out_signature='a{ss}') def prefs_list(self): prefs_dict = DBUS_DICT_SS() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4fec13b76da57d1441472f247ccc84e65… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4fec13b76da57d1441472f247ccc84e65… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-0.6.4
by Yann Leboulanger 17 Mar '18

17 Mar '18

Yann Leboulanger pushed new tag nbxmpp-0.6.4 at gajim / python-nbxmpp --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/tree/nbxmpp-0.6.4 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] prepare 0.6.4 release
by Yann Leboulanger 17 Mar '18

17 Mar '18

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: ad40cafa by Yann Leboulanger at 2018-03-17T17:36:12+01:00 prepare 0.6.4 release - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +python-nbxmpp 0.6.4 (17 March 2018) + + * Fix SOCKS5 usage + python-nbxmpp 0.6.3 (26 January 2018) * Add ALPN and SNI support for when using DirectTLS ===================================== nbxmpp/__init__.py ===================================== --- a/nbxmpp/__init__.py +++ b/nbxmpp/__init__.py @@ -17,4 +17,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.6.3" +__version__ = "0.6.4" ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.6.3', + version='0.6.4', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ad40cafa84a639a1b63e7b5e62… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ad40cafa84a639a1b63e7b5e62… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add [URI...] to commandline --help
by Philipp Hörist 17 Mar '18

17 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 47f08365 by Philipp Hörist at 2018-03-17T17:16:48+01:00 Add [URI...] to commandline --help - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -106,6 +106,8 @@ class GajimApplication(Gtk.Application): GLib.OptionArg.NONE, _('Start a new chat')) + self.add_main_option_entries(self._get_remaining_entry()) + self.connect('handle-local-options', self._handle_local_options) self.connect('command-line', self._handle_remote_options) self.connect('startup', self._startup) @@ -120,6 +122,17 @@ class GajimApplication(Gtk.Application): if GLib.get_application_name() != 'Gajim': GLib.set_application_name('Gajim') + @staticmethod + def _get_remaining_entry(): + option = GLib.OptionEntry() + option.arg = GLib.OptionArg.STRING_ARRAY + option.arg_data = None + option.arg_description = ('[URI …]') + option.flags = GLib.OptionFlags.NONE + option.long_name = GLib.OPTION_REMAINING + option.short_name = 0 + return [option] + def _startup(self, application): from gajim import gtkexcepthook gtkexcepthook.init() @@ -312,25 +325,21 @@ class GajimApplication(Gtk.Application): 'start-chat', ] + remaining = options.lookup_value(GLib.OPTION_REMAINING, + GLib.VariantType.new('as')) + for cmd in remote_commands: if options.contains(cmd): self.activate_action(cmd) return 0 - uri = self._parse_uris(command_line) - if uri is not None: - self._open_uris(uri) + if remaining is not None: + self._open_uris(remaining.unpack()) return 0 self.activate() return 0 - @staticmethod - def _parse_uris(command_line): - args = command_line.get_arguments() - if len(args) > 1: - return args[1:] - def _handle_local_options(self, application, options: GLib.VariantDict) -> int: # Parse all options that have to be executed before ::startup View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/47f0836567c3d7e680025730316d8d80d9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/47f0836567c3d7e680025730316d8d80d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 3 commits: Handle connection lost notification click
by Philipp Hörist 17 Mar '18

17 Mar '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 191a5772 by Philipp Hörist at 2018-03-17T14:16:59+01:00 Handle connection lost notification click Fixes #8823 - - - - - c3896630 by Philipp Hörist at 2018-03-17T14:17:08+01:00 Fix deleting an account that was never connected Fixes #8951 - - - - - 4fec13b7 by Philipp Hörist at 2018-03-17T14:17:19+01:00 Catch all exceptions when testing Farstream - - - - - 3 changed files: - gajim/common/app.py - gajim/common/logger.py - gajim/gui_interface.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -228,7 +228,8 @@ try: session = conference.new_session(Farstream.MediaType.AUDIO) del session del conference - except GLib.GError: + except Exception as e: + glog.info(e) HAVE_FARSTREAM = False except (ImportError, ValueError): ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -1104,8 +1104,12 @@ class Logger: :param account_jid: The jid of the account """ - - jid_id = self.get_jid_id(account_jid) + try: + jid_id = self.get_jid_id(account_jid) + except ValueError: + # This happens if the JID never made it to the Database + # because the account was never connected + return sql = ''' DELETE FROM roster_entry WHERE account_jid_id = {jid_id}; ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -227,7 +227,7 @@ class Interface: path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48) account = obj.conn.name notify.popup(_('Connection Failed'), account, account, - '', path, obj.title, obj.msg) + 'connection-lost', path, obj.title, obj.msg) @staticmethod def unblock_signed_in_notifications(account): @@ -1685,6 +1685,10 @@ class Interface: resource = app.get_resource_from_jid(fjid) jid = app.get_jid_without_resource(fjid) + if type_ == 'connection-lost': + app.interface.roster.window.present() + return + if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'): w = self.msg_win_mgr.get_window(jid, account) if jid in self.minimized_controls[account]: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/245e478ea6245848a419e68b637893b88… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/245e478ea6245848a419e68b637893b88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch all exceptions when testing Farstream
by Philipp Hörist 17 Mar '18

17 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 52c06cd6 by Philipp Hörist at 2018-03-17T12:20:21+01:00 Catch all exceptions when testing Farstream - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -228,7 +228,8 @@ try: session = conference.new_session(Farstream.MediaType.AUDIO) del session del conference - except GLib.GError: + except Exception as e: + glog.info(e) HAVE_FARSTREAM = False except (ImportError, ValueError): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52c06cd64f2b2c4f767a627c21ed8cf8c2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52c06cd64f2b2c4f767a627c21ed8cf8c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix deleting an account that was never connected
by Philipp Hörist 16 Mar '18

16 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d8777a78 by Philipp Hörist at 2018-03-17T00:20:11+01:00 Fix deleting an account that was never connected Fixes #8951 - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -1104,8 +1104,12 @@ class Logger: :param account_jid: The jid of the account """ - - jid_id = self.get_jid_id(account_jid) + try: + jid_id = self.get_jid_id(account_jid) + except ValueError: + # This happens if the JID never made it to the Database + # because the account was never connected + return sql = ''' DELETE FROM roster_entry WHERE account_jid_id = {jid_id}; View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d8777a78aa49c9edf8d9876c66c9c5b24e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d8777a78aa49c9edf8d9876c66c9c5b24e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Handle connection lost notification click
by Philipp Hörist 15 Mar '18

15 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8f2bc1e1 by Philipp Hörist at 2018-03-15T18:37:34+01:00 Handle connection lost notification click Fixes #8823 - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -227,7 +227,7 @@ class Interface: path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48) account = obj.conn.name notify.popup(_('Connection Failed'), account, account, - '', path, obj.title, obj.msg) + 'connection-lost', path, obj.title, obj.msg) @staticmethod def unblock_signed_in_notifications(account): @@ -1685,6 +1685,10 @@ class Interface: resource = app.get_resource_from_jid(fjid) jid = app.get_jid_without_resource(fjid) + if type_ == 'connection-lost': + app.interface.roster.window.present() + return + if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'): w = self.msg_win_mgr.get_window(jid, account) if jid in self.minimized_controls[account]: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8f2bc1e1c6ec0fc8c07787fc2dd5c0c6aa… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8f2bc1e1c6ec0fc8c07787fc2dd5c0c6aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix syntax error
by Philipp Hörist 14 Mar '18

14 Mar '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c9dfc044 by Philipp Hörist at 2018-03-14T23:17:29+01:00 Fix syntax error - - - - - 1 changed file: - nbxmpp/auth_nb.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== --- a/nbxmpp/auth_nb.py +++ b/nbxmpp/auth_nb.py @@ -695,7 +695,7 @@ class NonBlockingBind(PlugIn): return self.session = -1 - session = feats.getTag('session', namespace=NS_SESSION): + session = feats.getTag('session', namespace=NS_SESSION) if session is not None: if session.getTag('optional') is None: self.session = 1 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c9dfc0447e4800e0317aaa6ec9… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c9dfc0447e4800e0317aaa6ec9… You're receiving this email because of your account on dev.gajim.org.

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