Commits October 2018

commits@gajim.org

1 participants
107 discussions

[Git][gajim/gajim][master] Default to showing offline contacts
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c58ea133 by Philipp Hörist at 2018-10-13T14:21:44Z Default to showing offline contacts Many messengers dont show the status anymore, its not evident to new users that most of their roster is hidden per default and they have to show it to access the contacts - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== @@ -79,7 +79,7 @@ class Config: 'autopopupaway': [opt_bool, False], 'autopopup_chat_opened': [opt_bool, False, _('Show desktop notification even when a chat window is opened for this contact and does not have focus')], 'sounddnd': [opt_bool, False, _('Play sound when user is busy')], - 'showoffline': [opt_bool, False], + 'showoffline': [opt_bool, True], 'show_only_chat_and_online': [opt_bool, False, _('Show only online and free for chat contacts in roster.')], 'show_transports_group': [opt_bool, True], 'autoaway': [opt_bool, True], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c58ea1337943e0564aa433244652e6b39f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c58ea1337943e0564aa433244652e6b39f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Windows: Add precis-i18n to the build
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: c0ae4af7 by Philipp Hörist at 2018-10-13T13:42:19Z Windows: Add precis-i18n to the build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -102,6 +102,7 @@ python-gnupg python-axolotl qrcode cssutils +precis-i18n " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c0ae4af7cfbd77d365a9db61544a29af02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c0ae4af7cfbd77d365a9db61544a29af02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Add precis-i18n to the build
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7113760b by Philipp Hörist at 2018-10-13T13:41:05Z Windows: Add precis-i18n to the build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -102,6 +102,7 @@ python-gnupg python-axolotl qrcode cssutils +precis-i18n " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7113760b03ce8a0e32ea7357a5609c654e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7113760b03ce8a0e32ea7357a5609c654e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.1.0-beta2
by Yann Leboulanger 13 Oct '18

13 Oct '18

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

1 0

[Git][gajim/gajim][gajim_1.1] update translations from pootle
by Yann Leboulanger 13 Oct '18

13 Oct '18

Yann Leboulanger pushed to branch gajim_1.1 at gajim / gajim Commits: 8e04f07c by Yann Leboulanger at 2018-10-13T12:44:20Z update translations from pootle - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb_NO.po - po/nl.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ru.po - po/sk.po - po/sr.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e04f07c9e5a2b95ca3bd5f7ef6cb109f9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e04f07c9e5a2b95ca3bd5f7ef6cb109f9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Update ChangeLog
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 425e1c76 by Philipp Hörist at 2018-10-13T12:15:37Z Update ChangeLog - - - - - e3bf5449 by Philipp Hörist at 2018-10-13T12:16:00Z Raise Gajim version - - - - - 2 changed files: - ChangeLog - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,4 +1,4 @@ -Gajim 1.0.99.1 (07 October 2018) +Gajim 1.0.99.1 (13 October 2018) New ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.0.99" +__version__ = "1.0.99.1" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ec05b1a47e8f63477175b66d3120a3a97… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ec05b1a47e8f63477175b66d3120a3a97… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Catch exceptions when loading plugins
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: ec05b1a4 by Philipp Hörist at 2018-10-13T12:14:28Z Catch exceptions when loading plugins - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -179,7 +179,12 @@ class PluginManager(metaclass=Singleton): :todo: what about adding plug-ins that are already added? Module reload and adding class from reloaded module or ignoring adding plug-in? ''' - plugin = plugin_class() + try: + plugin = plugin_class() + except Exception: + log.exception('Error while loading a plugin') + return + if plugin not in self.plugins: if not self._plugin_has_entry_in_global_config(plugin): self._create_plugin_entry_in_global_config(plugin) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ec05b1a47e8f63477175b66d3120a3a977… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ec05b1a47e8f63477175b66d3120a3a977… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch exceptions when loading plugins
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2b7006e8 by Philipp Hörist at 2018-10-13T12:13:38Z Catch exceptions when loading plugins - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -179,7 +179,12 @@ class PluginManager(metaclass=Singleton): :todo: what about adding plug-ins that are already added? Module reload and adding class from reloaded module or ignoring adding plug-in? ''' - plugin = plugin_class() + try: + plugin = plugin_class() + except Exception: + log.exception('Error while loading a plugin') + return + if plugin not in self.plugins: if not self._plugin_has_entry_in_global_config(plugin): self._create_plugin_entry_in_global_config(plugin) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b7006e8837d60096e56730443f5947865… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b7006e8837d60096e56730443f5947865… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 4 commits: Ability to update plugins on startup from a download folder
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 83c73731 by Yann Leboulanger at 2018-10-13T11:31:00Z Ability to update plugins on startup from a download folder - - - - - cc62761d by Philipp Hörist at 2018-10-13T11:31:10Z Add get_builder() for plugins - - - - - 0f0c0a6a by Philipp Hörist at 2018-10-13T11:31:48Z Allow to load multiple widgets with get_builder() - - - - - aff0dbe9 by Philipp Hörist at 2018-10-13T11:32:14Z Bind textdomain also for plugins - - - - - 5 changed files: - gajim/common/configpaths.py - gajim/gtk/util.py - gajim/plugins/helpers.py - gajim/plugins/pluginmanager.py - gajim/plugins/plugins_i18n.py Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -214,6 +214,7 @@ class ConfigPaths: # Data paths ('LOG_DB', 'logs.db', PathLocation.DATA, PathType.FILE), ('MY_CACERTS', 'cacerts.pem', PathLocation.DATA, PathType.FILE), + ('PLUGINS_DOWNLOAD', 'plugins_download', PathLocation.CACHE, PathType.FOLDER), ('PLUGINS_USER', 'plugins', PathLocation.DATA, PathType.FOLDER), ('MY_EMOTS', 'emoticons', PathLocation.DATA, PathType.FOLDER_OPTIONAL), ===================================== gajim/gtk/util.py ===================================== @@ -12,8 +12,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any +from typing import List from typing import Tuple + import os import sys import logging @@ -35,9 +38,19 @@ log = logging.getLogger('gajim.gtk.util') class Builder: - def __init__(self, filename: str, widget: str = None) -> None: + def __init__(self, + filename: str, + widgets: List[str] = None, + domain: str = None, + gettext_: Any = None) -> None: self._builder = Gtk.Builder() - self._builder.set_translation_domain(i18n.DOMAIN) + + if domain is None: + domain = i18n.DOMAIN + self._builder.set_translation_domain(domain) + + if gettext_ is None: + gettext_ = _ file_path = os.path.join(configpaths.get('GUI'), filename) @@ -46,21 +59,22 @@ class Builder: tree = ET.parse(file_path) for node in tree.iter(): if 'translatable' in node.attrib and node.text is not None: - node.text = _(node.text) + node.text = gettext_(node.text) + xml_text = ET.tostring(tree.getroot(), encoding='unicode', method='xml') - if widget is not None: - self._builder.add_objects_from_string(xml_text, [widget]) + if widgets is not None: + self._builder.add_objects_from_string(xml_text, widgets) else: # Workaround # https://gitlab.gnome.org/GNOME/pygobject/issues/255 Gtk.Builder.__mro__[1].add_from_string( self._builder, xml_text, len(xml_text.encode("utf-8"))) else: - if widget is not None: - self._builder.add_objects_from_file(file_path, [widget]) + if widgets is not None: + self._builder.add_objects_from_file(file_path, widgets) else: self._builder.add_from_file(file_path) @@ -71,8 +85,8 @@ class Builder: return self._builder.get_object(name) -def get_builder(file_name: str, widget: str = None) -> Builder: - return Builder(file_name, widget) +def get_builder(file_name: str, widgets: List[str] = None) -> Builder: + return Builder(file_name, widgets) def load_icon(icon_name, widget, size=16, pixbuf=False, ===================================== gajim/plugins/helpers.py ===================================== @@ -23,9 +23,14 @@ Helper code related to plug-ins management system. __all__ = ['log', 'log_calls', 'Singleton'] +from typing import List + import logging import functools +from gajim.plugins import plugins_i18n +from gajim.gtk.util import Builder + log = logging.getLogger('gajim.plugin_system') ''' Logger for code related to plug-in system. @@ -130,3 +135,10 @@ class Singleton(type): #'classname' : cls.__name__}) return cls.instance + + +def get_builder(file_name: str, widgets: List[str] = None) -> Builder: + return Builder(file_name, + widgets, + domain=plugins_i18n.DOMAIN, + gettext_=plugins_i18n._) ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -27,7 +27,7 @@ import os import sys import fnmatch import zipfile -from shutil import rmtree +from shutil import rmtree, move import configparser from pkg_resources import parse_version @@ -109,6 +109,8 @@ class PluginManager(metaclass=Singleton): Registered names with instances of encryption Plugins. ''' + self.update_plugins() + for path in reversed(configpaths.get_plugin_dirs()): pc = self.scan_dir_for_plugins(path) self.add_plugins(pc) @@ -126,6 +128,47 @@ class PluginManager(metaclass=Singleton): def _remove_plugin_entry_in_global_config(self, plugin): app.config.del_per('plugins', plugin.short_name) + @log_calls('PluginManager') + def update_plugins(self, replace=True, activate=False, plugin_name=None): + ''' + Move plugins from the downloaded folder to the user plugin folder + + :param replace: replace plugin files if they already exist. + :type replace: boolean + :param activate: load and activate the plugin + :type activate: boolean + :param plugin_name: if provided, update only this plugin + :type plugin_name: str + :return: list of updated plugins (files have been installed) + :rtype: [] of str + ''' + updated_plugins = [] + user_dir = configpaths.get('PLUGINS_USER') + dl_dir = configpaths.get('PLUGINS_DOWNLOAD') + to_update = [plugin_name] if plugin_name else next(os.walk(dl_dir))[1] + for directory in to_update: + src_dir = os.path.join(dl_dir, directory) + dst_dir = os.path.join(user_dir, directory) + try: + if os.path.exists(dst_dir): + if not replace: + continue + self.delete_plugin_files(dst_dir) + move(src_dir, dst_dir) + except Exception: + log.exception('Upgrade of plugin %s failed. Impossible to move ' + 'files from "%s" to "%s"', directory, src_dir, dst_dir) + continue + updated_plugins.append(directory) + if activate: + pc = self.scan_dir_for_plugins(dst_dir, scan_dirs=True, + package=True) + self.add_plugin(pc[0]) + plugin = self.plugins[-1] + self.activate_plugin(plugin) + return updated_plugins + + @log_calls('PluginManager') def init_plugins(self): self._activate_all_plugins_from_global_config() @@ -725,10 +768,7 @@ class PluginManager(metaclass=Singleton): plugin = self.plugins[-1] return plugin - def uninstall_plugin(self, plugin): - ''' - Deactivate and remove plugin from `plugins` list - ''' + def delete_plugin_files(self, plugin_path): def on_error(func, path, error): if func == os.path.islink: # if symlink @@ -737,9 +777,15 @@ class PluginManager(metaclass=Singleton): # access is denied or other raise PluginsystemError(error[1][1]) + rmtree(plugin_path, False, on_error) + + def uninstall_plugin(self, plugin): + ''' + Deactivate and remove plugin from `plugins` list + ''' if plugin: self.remove_plugin(plugin) - rmtree(plugin.__path__, False, on_error) + self.delete_plugin_files(plugin.__path__) if self._plugin_has_entry_in_global_config(plugin): self._remove_plugin_entry_in_global_config(plugin) ===================================== gajim/plugins/plugins_i18n.py ===================================== @@ -15,6 +15,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os +import locale import gettext from gajim.common import configpaths @@ -28,3 +29,6 @@ try: _ = t.gettext except OSError: _ = gettext.gettext + +if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, plugins_locale_dir) # type: ignore View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/90a44f61e906f819b4114b2220420c39c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/90a44f61e906f819b4114b2220420c39c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Bind textomain also for plugins
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 683e7aa4 by Philipp Hörist at 2018-10-13T11:27:33Z Bind textomain also for plugins - - - - - 1 changed file: - gajim/plugins/plugins_i18n.py Changes: ===================================== gajim/plugins/plugins_i18n.py ===================================== @@ -15,6 +15,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os +import locale import gettext from gajim.common import configpaths @@ -28,3 +29,6 @@ try: _ = t.gettext except OSError: _ = gettext.gettext + +if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, plugins_locale_dir) # type: ignore View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/683e7aa4c77e590ca6e712009dcf51083f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/683e7aa4c77e590ca6e712009dcf51083f… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2018