Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Windows: Always hide roster window on X
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3b73b6f5 by Philipp Hörist at 2018-04-30T00:35:48+02:00 Windows: Always hide roster window on X As all Windows versions have a status icon and most Windows users expect this Fixes #9031 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2381,7 +2381,7 @@ class RosterWindow: x, y = self.window.get_position() app.config.set('roster_x-position', x) app.config.set('roster_y-position', y) - if app.config.get('hide_on_roster_x_button'): + if os.name == 'nt' or app.config.get('hide_on_roster_x_button'): self.window.hide() else: self.window.iconify() @@ -3696,7 +3696,7 @@ class RosterWindow: 'quit_on_roster_x_button') and ((app.interface.systray_enabled and\ app.config.get('trayicon') == 'always') or app.config.get( 'allow_hide_roster')): - if app.config.get('hide_on_roster_x_button'): + if os.name == 'nt' or app.config.get('hide_on_roster_x_button'): self.window.hide() else: self.window.iconify() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b73b6f5bb1dc6a0f61f1bbfb30e5c1534… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b73b6f5bb1dc6a0f61f1bbfb30e5c1534… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Show correct account lable in tooltip
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 06c4ce60 by Philipp Hörist at 2018-04-29T23:47:30+02:00 Show correct account lable in tooltip Fixes #9065 - - - - - 7429b970 by Philipp Hörist at 2018-04-30T00:26:19+02:00 Fix Flatpak install instructions - - - - - 3 changed files: - flatpak/README.md - gajim/common/helpers.py - gajim/tooltips.py Changes: ===================================== flatpak/README.md ===================================== --- a/flatpak/README.md +++ b/flatpak/README.md @@ -26,7 +26,7 @@ Replace install path `~/Gajim/gajim_flatpak` with an install path of your choice 2. `flatpak --user install gnome org.gnome.Platform//3.28` 3. `flatpak --user install gnome org.gnome.Sdk//3.28` 4. `flatpak-builder --repo=gajim_flatpak_repo ~/Gajim/gajim_flatpak ~/Gajim/org.gajim.Gajim.json` -5. `flatpak --user remote-add --no-gpg-verify gajim_flatpak_repo ~/Gajim/gajim_flatpak_repo` +5. `flatpak --user remote-add --no-gpg-verify gajim_flatpak_repo gajim_flatpak_repo` 6. `flatpak --user install gajim_flatpak_repo org.gajim.Gajim` 7. `flatpak run org.gajim.Gajim` ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1247,8 +1247,13 @@ def get_accounts_info(): message = message.strip() if message != '': single_line += ': ' + message - accounts.append({'name': account, 'status_line': single_line, - 'show': status, 'message': message}) + account_label = app.config.get_per( + 'accounts', account, 'account_label') + accounts.append({'name': account, + 'account_label': account_label or account, + 'status_line': single_line, + 'show': status, + 'message': message}) return accounts def get_current_show(account): ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -150,11 +150,11 @@ class NotificationAreaTooltip(StatusTable): show_lock = False if message: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['name']) + ' - ' + message, + GLib.markup_escape_text(acct['account_label']) + ' - ' + message, show_lock=show_lock, indent=False) else: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['name']), show_lock=show_lock, + GLib.markup_escape_text(acct['account_label']), show_lock=show_lock, indent=False) for line in acct['event_lines']: self.add_text_row(' ' + line, 1) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e0e3b9609ae0ce7d3749e8f5f9bfb1f9c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e0e3b9609ae0ce7d3749e8f5f9bfb1f9c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont set urgency when we already set priority
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e0e3b960 by Philipp Hörist at 2018-04-29T23:38:16+02:00 Dont set urgency when we already set priority set_urgent is deprecated in favor of set_priority Fixes #9101 - - - - - 1 changed file: - gajim/notify.py Changes: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -108,7 +108,6 @@ text=None, timeout=-1): # Only one notification per JID notif_id = jid notification.set_priority(Gio.NotificationPriority.NORMAL) - notification.set_urgent(False) app.app.send_notification(notif_id, notification) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e0e3b9609ae0ce7d3749e8f5f9bfb1f9cf… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e0e3b9609ae0ce7d3749e8f5f9bfb1f9cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont allow plain BOSH by default
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 56a5d016 by Philipp Hörist at 2018-04-29T23:34:46+02:00 Dont allow plain BOSH by default - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1191,15 +1191,18 @@ class Connection(CommonConnection, ConnectionHandlers): if scheme == 'https': connection_types = ['ssl'] else: - connection_types = ['plain'] + if allow_plaintext_connection: + connection_types = ['plain'] + else: + connection_types = [] host = self._select_next_host(self._hosts) self._hosts.remove(host) # Skip record if connection type is not supported. if host['type'] not in connection_types: - log.debug("Skipping connection record with unsupported type: %s" % - host['type']) + log.info("Skipping connection record with unsupported type: %s", + host['type']) self._connect_to_next_host(retry) return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/56a5d0160985d76999896cf7e4fc9f7220… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/56a5d0160985d76999896cf7e4fc9f7220… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Jingle: Check first if we have a content
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8554e3e by Philipp Hörist at 2018-04-29T23:30:08+02:00 Jingle: Check first if we have a content Fixes #9094 - - - - - 1 changed file: - gajim/common/jingle_session.py Changes: ===================================== gajim/common/jingle_session.py ===================================== --- a/gajim/common/jingle_session.py +++ b/gajim/common/jingle_session.py @@ -523,6 +523,16 @@ class JingleSession: # error. # Lets check what kind of jingle session does the peer want contents, contents_rejected, reason_txt = self.__parse_contents(jingle) + + # If there's no content we understand... + if not contents: + # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate + reason = nbxmpp.Node('reason') + reason.setTag(reason_txt) + self.__ack(stanza, jingle, error, action) + self._session_terminate(reason) + raise nbxmpp.NodeProcessed + # If we are not receivin a file # Check if there's already a session with this user: if contents[0].media != 'file': @@ -553,14 +563,7 @@ class JingleSession: 'it is not allowed to request', pjid) self.decline_session() raise nbxmpp.NodeProcessed - # If there's no content we understand... - if not contents: - # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate - reason = nbxmpp.Node('reason') - reason.setTag(reason_txt) - self.__ack(stanza, jingle, error, action) - self._session_terminate(reason) - raise nbxmpp.NodeProcessed + self.state = JingleStates.PENDING # Send event about starting a session app.nec.push_incoming_event(JingleRequestReceivedEvent(None, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8554e3e223c8e48c900521faa30a3d483… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8554e3e223c8e48c900521faa30a3d483… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Update Namespaces
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4725e752 by Philipp Hörist at 2018-04-29T21:42:58+02:00 Update Namespaces - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -88,6 +88,7 @@ NS_MSG_HINTS = 'urn:xmpp:hints' # XEP-0280 NS_HTTP_AUTH = 'http://jabber.org/protocol/http-auth' # XEP-0070 NS_HTTP_BIND = 'http://jabber.org/protocol/httpbind' # XEP-0124 NS_HTTPUPLOAD = 'urn:xmpp:http:upload' # XEP-0363 +NS_HTTPUPLOAD_0 = 'urn:xmpp:http:upload:0' # XEP-0363 NS_IBB = 'http://jabber.org/protocol/ibb' NS_IDLE = 'urn:xmpp:idle:1' # XEP-0319 NS_INVISIBLE = 'presence-invisible' # Jabberd2 @@ -186,6 +187,7 @@ NS_HASHES_SHA3_256 = 'urn:xmpp:hash-function-text-names:sha3-256' NS_HASHES_SHA3_512 = 'urn:xmpp:hash-function-text-names:sha3-512' NS_HASHES_BLAKE2B_256 = 'urn:xmpp:hash-function-text-names:id-blake2b256' NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' +NS_OPENPGP = 'urn:xmpp:openpgp:0' #xmpp_stream_error_conditions = ''' #bad-format -- -- -- The entity has sent XML that cannot be processed. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4725e752099cd5c3b91fa2ed2e… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4725e752099cd5c3b91fa2ed2e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix missing argument
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1ace62cd by Philipp Hörist at 2018-04-29T21:38:16+02:00 Fix missing argument with HTTP Transports like BOSH we dont need ALPN, so it should always be False - - - - - 1 changed file: - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/transports_nb.py ===================================== --- a/nbxmpp/transports_nb.py +++ b/nbxmpp/transports_nb.py @@ -704,7 +704,7 @@ class NonBlockingHTTP(NonBlockingTCP): :param http_dict: dictionary with data for HTTP request and headers """ NonBlockingTCP.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs, tls_version, cipher_list, proxy_dict) + estabilish_tls, certs, tls_version, cipher_list, False, proxy_dict) self.http_protocol, self.http_host, self.http_port, self.http_path = \ urisplit(http_dict['http_uri']) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/1ace62cd0747e51c35e8059168… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/1ace62cd0747e51c35e8059168… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Catch UnicodeError when decoding certs
by Philipp Hörist 28 Apr '18

28 Apr '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 83e1028b by Philipp Hörist at 2018-04-28T19:07:49+02:00 Catch UnicodeError when decoding certs - - - - - 1 changed file: - nbxmpp/tls_nb.py Changes: ===================================== nbxmpp/tls_nb.py ===================================== --- a/nbxmpp/tls_nb.py +++ b/nbxmpp/tls_nb.py @@ -342,7 +342,7 @@ class NonBlockingTLS(PlugIn): f = open(cert_path, encoding='utf-8') else: f = io.open(cert_path, encoding='utf-8') - except IOError as e: + except (IOError, UnicodeError) as e: log.warning('Unable to open certificate file %s: %s' % \ (cert_path, str(e))) return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/83e1028b7693a7a2fe3076e3fa… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/83e1028b7693a7a2fe3076e3fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 2 commits: Add support for dynamic reloading of plugins
by Philipp Hörist 28 Apr '18

28 Apr '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: dfd0e96f by Markus Wintermann at 2018-04-28T13:48:56+02:00 Add support for dynamic reloading of plugins - - - - - 75b3412a by Philipp Hörist at 2018-04-28T13:49:53+02:00 Update Flatpak - - - - - 3 changed files: - gajim/plugins/gui.py - gajim/plugins/pluginmanager.py - org.gajim.Gajim.json Changes: ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -251,7 +251,7 @@ class PluginsWindow(object): if iter: plugin = model.get_value(iter, Column.PLUGIN) try: - app.plugin_manager.remove_plugin(plugin) + app.plugin_manager.uninstall_plugin(plugin) except PluginsystemError as e: WarningDialog(_('Unable to properly remove the plugin'), str(e), self.window) ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -36,6 +36,7 @@ from pkg_resources import parse_version from gajim.common import app from gajim.common import nec +from gajim.common import configpaths from gajim.common.exceptions import PluginsystemError from gajim.plugins.helpers import log, log_calls, Singleton @@ -149,6 +150,32 @@ class PluginManager(metaclass=Singleton): plugin.version, plugin.__module__, plugin.short_name)) @log_calls('PluginManager') + def remove_plugin(self, plugin): + ''' + removes the plugin from the plugin list and deletes all loaded modules + from sys. This way we will have a fresh start when the plugin gets added + agin. + ''' + if plugin.active: + self.deactivate_plugin(plugin) + + self.plugins.remove(plugin) + + # remove modules from cache + base_package = plugin.__module__.split('.')[0] + # get the subpackages/-modules of the base_package. Add a dot to the + # name to avoid name problems (removing module_abc if base_package is + # module_ab) + modules_to_remove = [module for module in sys.modules + if module.startswith('{}.'.format(base_package))] + # remove the base_package itself + if base_package in sys.modules: + modules_to_remove.append(base_package) + + for module_to_remove in modules_to_remove: + del sys.modules[module_to_remove] + + @log_calls('PluginManager') def add_plugins(self, plugin_classes): for plugin_class in plugin_classes: self.add_plugin(plugin_class) @@ -531,20 +558,9 @@ class PluginManager(metaclass=Singleton): continue module = None - try: - if module_name in sys.modules: - if path == app.PLUGINS_DIRS[0]: - # Only reload plugins from Gajim base dir when they - # dont exist. This means plugins in the user path are - # always preferred. - continue - from imp import reload - log.info('Reloading %s', module_name) - module = reload(sys.modules[module_name]) - else: - log.info('Loading %s', module_name) - module = __import__(module_name) + log.info('Loading %s', module_name) + module = __import__(module_name) except Exception as error: log.warning( "While trying to load {plugin}, exception occurred".format(plugin=elem_name), @@ -632,14 +648,14 @@ class PluginManager(metaclass=Singleton): if len(dirs) > 1: raise PluginsystemError(_('Archive is malformed')) - base_dir, user_dir = app.PLUGINS_DIRS + user_dir = configpaths.get('PLUGINS_USER') plugin_dir = os.path.join(user_dir, dirs[0]) if os.path.isdir(plugin_dir): # Plugin dir already exists if not owerwrite: raise PluginsystemError(_('Plugin already exists')) - self.remove_plugin(self.get_plugin_by_path(plugin_dir)) + self.uninstall_plugin(self.get_plugin_by_path(plugin_dir)) zip_file.extractall(user_dir) zip_file.close() @@ -651,7 +667,7 @@ class PluginManager(metaclass=Singleton): plugin = self.plugins[-1] return plugin - def remove_plugin(self, plugin): + def uninstall_plugin(self, plugin): ''' Deactivate and remove plugin from `plugins` list ''' @@ -664,15 +680,10 @@ class PluginManager(metaclass=Singleton): raise PluginsystemError(error[1][1]) if plugin: - if plugin.active: - self.deactivate_plugin(plugin) + self.remove_plugin(plugin) rmtree(plugin.__path__, False, on_error) - self.plugins.remove(plugin) if self._plugin_has_entry_in_global_config(plugin): self._remove_plugin_entry_in_global_config(plugin) - del sys.modules[plugin.__module__.split('.')[0]] - del plugin.__module__.split('.')[-1] - del plugin def get_plugin_by_path(self, plugin_dir): for plugin in self.plugins: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -359,8 +359,8 @@ }, { "type": "archive", - "url": "https://ftp.gajim.org/plugins_1/plugin_installer.zip", - "sha256": "3b0c40b22596da54c0eea7f7571c83b61619996ebe6c00b304d7fa5278aaefbb", + "url": "https://ftp.gajim.org/plugins_releases/plugin_installer_0.20.4.zip", + "sha256": "02f71f0921d67433ecdca7f0b682a63cadaa7a057fa68608f1ec7ce3fae44fb9", "dest": "gajim/data/plugins/plugin_installer" } ] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1786bb496aa423ae3845a4a37de55aa26… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1786bb496aa423ae3845a4a37de55aa26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Flatpak
by Philipp Hörist 28 Apr '18

28 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bf8dcb5a by Philipp Hörist at 2018-04-28T13:42:08+02:00 Update Flatpak - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -360,8 +360,8 @@ }, { "type": "archive", - "url": "https://ftp.gajim.org/plugins_1/plugin_installer.zip", - "sha256": "3b0c40b22596da54c0eea7f7571c83b61619996ebe6c00b304d7fa5278aaefbb", + "url": "https://ftp.gajim.org/plugins_releases/plugin_installer_0.20.4.zip", + "sha256": "02f71f0921d67433ecdca7f0b682a63cadaa7a057fa68608f1ec7ce3fae44fb9", "dest": "gajim/data/plugins/plugin_installer" } ] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf8dcb5a3eb30b90a3480b9e24ef540c27… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf8dcb5a3eb30b90a3480b9e24ef540c27… 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