Commits May 2020

commits@gajim.org

1 participants
67 discussions

[Git][gajim/gajim][master] 3 commits: MUCData: Add propertys
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8d5474af by lovetox at 2020-05-16T22:56:04+02:00 MUCData: Add propertys - - - - - 07a89305 by lovetox at 2020-05-16T22:56:04+02:00 Add TaskManager Adds a queue for executing background tasks For example fetching avatars or disco info - - - - - afef11e8 by lovetox at 2020-05-16T22:56:04+02:00 Caps: Use TaskManager for requesting disco info - - - - - 5 changed files: - gajim/application.py - gajim/common/app.py - gajim/common/const.py - gajim/common/modules/caps.py - + gajim/common/task_manager.py Changes: ===================================== gajim/application.py ===================================== @@ -55,6 +55,7 @@ from gajim.common import exceptions from gajim.common import logger from gajim.common.i18n import _ from gajim.common.contacts import LegacyContactsAPI +from gajim.common.task_manager import TaskManager class GajimApplication(Gtk.Application): @@ -218,6 +219,7 @@ class GajimApplication(Gtk.Application): from gajim.common.cert_store import CertificateStore app.cert_store = CertificateStore() + app.task_manager = TaskManager() # Set Application Menu app.app = self ===================================== gajim/common/app.py ===================================== @@ -131,6 +131,8 @@ proxy65_manager = None cert_store = None +task_manager = None + # zeroconf account name ZEROCONF_ACC_NAME = 'Local' ===================================== gajim/common/const.py ===================================== @@ -11,6 +11,8 @@ from gajim.common.i18n import Q_ EncryptionData = namedtuple('EncryptionData', 'additional_data') EncryptionData.__new__.__defaults__ = (None,) # type: ignore +Entity = namedtuple('Entity', 'jid node hash method') + class AvatarSize(IntEnum): TAB = 16 @@ -216,6 +218,30 @@ class MUCJoinedState(Enum): def __str__(self): return self.name + @property + def is_joined(self): + return self == MUCJoinedState.JOINED + + @property + def is_not_joined(self): + return self == MUCJoinedState.NOT_JOINED + + @property + def is_joining(self): + return self == MUCJoinedState.JOINING + + @property + def is_creating(self): + return self == MUCJoinedState.CREATING + + @property + def is_captcha_request(self): + return self == MUCJoinedState.CAPTCHA_REQUEST + + @property + def is_captcha_failed(self): + return self == MUCJoinedState.CAPTCHA_FAILED + class ClientState(IntEnum): DISCONNECTING = 0 ===================================== gajim/common/modules/caps.py ===================================== @@ -17,6 +17,9 @@ # XEP-0115: Entity Capabilities +import weakref +from collections import defaultdict + from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler from nbxmpp.structs import DiscoIdentity @@ -25,8 +28,10 @@ from nbxmpp.util import compute_caps_hash from gajim.common import app from gajim.common.const import COMMON_FEATURES +from gajim.common.const import Entity from gajim.common.helpers import get_optional_features from gajim.common.nec import NetworkEvent +from gajim.common.task_manager import Task from gajim.common.modules.base import BaseModule @@ -52,6 +57,36 @@ class Caps(BaseModule): DiscoIdentity(category='client', type='pc', name='Gajim') ] + self._queued_tasks_by_hash = defaultdict(set) + self._queued_tasks_by_jid = {} + + def _queue_task(self, task): + old_task = self._get_task(task.entity.jid) + if old_task is not None: + self._remove_task(old_task) + + self._log.info('Queue query for hash %s', task.entity.hash) + self._queued_tasks_by_hash[task.entity.hash].add(task) + self._queued_tasks_by_jid[task.entity.jid] = task + app.task_manager.add_task(task) + + def _get_task(self, jid): + return self._queued_tasks_by_jid.get(jid) + + def _get_similar_tasks(self, task): + return self._queued_tasks_by_hash.pop(task.entity.hash) + + def _remove_task(self, task): + task.set_obsolete() + del self._queued_tasks_by_jid[task.entity.jid] + self._queued_tasks_by_hash[task.entity.hash].discard(task) + + def _remove_all_tasks(self): + for task in self._queued_tasks_by_jid.values(): + task.set_obsolete() + self._queued_tasks_by_jid.clear() + self._queued_tasks_by_hash.clear() + def _entity_caps(self, _con, _stanza, properties): if properties.type.is_error or properties.type.is_unavailable: return @@ -62,57 +97,70 @@ class Caps(BaseModule): if properties.entity_caps is None: return - jid = str(properties.jid) + task = EntityCapsTask(self._account, properties, self._execute_task) - hash_method = properties.entity_caps.hash - node = properties.entity_caps.node - caps_hash = properties.entity_caps.ver + self._log.info('Received %s', task.entity) - self._log.info( - 'Received from %s, type: %s, method: %s, node: %s, hash: %s', - jid, properties.type, hash_method, node, caps_hash) - - disco_info = app.logger.get_caps_entry(hash_method, caps_hash) + disco_info = app.logger.get_caps_entry(task.entity.method, + task.entity.hash) if disco_info is None: - self._con.get_module('Discovery').disco_info( - jid, - '%s#%s' % (node, caps_hash), - callback=self._on_disco_info, - user_data=hash_method) - - else: - app.logger.set_last_disco_info(jid, disco_info, cache_only=True) - app.nec.push_incoming_event( - NetworkEvent('caps-update', - account=self._account, - fjid=jid, - jid=properties.jid.getBare())) + self._queue_task(task) + return + + jid = str(properties.jid) + app.logger.set_last_disco_info(jid, disco_info, cache_only=True) + app.nec.push_incoming_event( + NetworkEvent('caps-update', + account=self._account, + fjid=jid, + jid=properties.jid.getBare())) + + def _execute_task(self, task): + self._log.info('Request %s from %s', task.entity.hash, task.entity.jid) + self._con.get_module('Discovery').disco_info( + task.entity.jid, + node=f'{task.entity.node}#{task.entity.hash}', + callback=self._on_disco_info) + + def _on_disco_info(self, disco_info): + task = self._get_task(disco_info.jid) + if task is None: + self._log.info('Task not found for %s', disco_info.jid) + return - def _on_disco_info(self, disco_info, hash_method): if is_error_result(disco_info): + self._remove_task(task) self._log.info(disco_info) return - bare_jid = disco_info.jid.getBare() + self._log.info('Disco Info received: %s', disco_info.jid) try: compute_caps_hash(disco_info) except Exception as error: + self._remove_task(task) self._log.warning('Disco info malformed: %s %s', disco_info.jid, error) return app.logger.add_caps_entry( str(disco_info.jid), - hash_method, + task.entity.method, disco_info.get_caps_hash(), disco_info) - app.nec.push_incoming_event( - NetworkEvent('caps-update', - account=self._account, - fjid=str(disco_info.jid), - jid=bare_jid)) + self._log.info('Finished query for %s', task.entity.hash) + + tasks = self._get_similar_tasks(task) + + for task in tasks: + self._remove_task(task) + self._log.info('Update %s', task.entity.jid) + app.nec.push_incoming_event( + NetworkEvent('caps-update', + account=self._account, + fjid=str(task.entity.jid), + jid=task.entity.jid.getBare())) def update_caps(self): if not app.account_is_connected(self._account): @@ -130,6 +178,52 @@ class Caps(BaseModule): app.connections[self._account].status, app.connections[self._account].status_message) + def cleanup(self): + self._remove_all_tasks() + BaseModule.cleanup(self) + + +class EntityCapsTask(Task): + def __init__(self, account, properties, callback): + Task.__init__(self) + self._account = account + self._callback = weakref.WeakMethod(callback) + + self.entity = Entity(jid=properties.jid, + node=properties.entity_caps.node, + hash=properties.entity_caps.ver, + method=properties.entity_caps.hash) + + self._from_muc = properties.from_muc + + def execute(self): + callback = self._callback() + if callback is not None: + callback(self) + + def preconditions_met(self): + try: + client = app.get_client(self._account) + except Exception: + return False + + if self._from_muc: + muc = client.get_module('MUC').get_manager().get( + self.entity.jid.getBare()) + + if muc is None or not muc.state.is_joined: + self.set_obsolete() + return False + return True + + return client.state.is_available + + def __repr__(self): + return f'Entity Caps ({self.entity.jid} {self.entity.hash})' + + def __hash__(self): + return hash(self.entity) + def get_instance(*args, **kwargs): return Caps(*args, **kwargs), 'Caps' ===================================== gajim/common/task_manager.py ===================================== @@ -0,0 +1,104 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import List + +import functools +import queue +import logging + +from gi.repository import GLib + +log = logging.getLogger('gajim.c.m.task_manager') + + +class TaskManager: + def __init__(self): + self._timeout = None + self._queue = queue.PriorityQueue() + + def _start_worker(self): + self._timeout = GLib.timeout_add_seconds(2, self._process_queue) + + def _process_queue(self): + log.info('%s tasks queued', self._queue.qsize()) + requeue = [] + while not self._queue.empty(): + task = self._queue.get_nowait() + if task.is_obsolete(): + log.info('Task obsolete: %r', task) + continue + + if not task.preconditions_met(): + if task.is_obsolete(): + log.info('Task obsolete: %r', task) + else: + requeue.append(task) + continue + + log.info('Execute task %r', task) + task.execute() + self._requeue_tasks(requeue) + return True + + if self._requeue_tasks(requeue): + # Queue is empty, but there are tasks to requeue + # don't stop worker + return True + + # Queue is empty, stop worker + self._timeout = None + return False + + def _requeue_tasks(self, tasks: List[Task]): + if not tasks: + return False + + for task in tasks: + log.info('Requeue task (preconditions not met): %r', task) + self._queue.put_nowait(task) + return True + + def add_task(self, task: Task): + log.info('Adding task: %r', task) + self._queue.put_nowait(task) + if self._timeout is None: + self._start_worker() + + +(a)functools.total_ordering +class Task: + def __init__(self, priority: int = 0): + self.priority = priority + self._obsolete = False + + def is_obsolete(self): + return self._obsolete + + def set_obsolete(self): + self._obsolete = True + + def __lt__(self, task: Task): + return self.priority < task.priority + + def __eq__(self, task: Task): + return task.priority == self.priority + + def execute(self): + raise NotImplementedError + + def preconditions_met(self): + raise NotImplementedError View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fdfb0864ffc169712d9a8bd5d63e4e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fdfb0864ffc169712d9a8bd5d63e4e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Client: Unregister modules when account is disabled
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: dce40846 by lovetox at 2020-05-16T17:50:30+02:00 Client: Unregister modules when account is disabled - - - - - fbd65d79 by lovetox at 2020-05-16T17:50:30+02:00 Client: Don't create nbxmpp.Client() after cleanup() - - - - - fdfb0864 by lovetox at 2020-05-16T17:50:30+02:00 PluginManager: Remove obsolete check on handler registration - - - - - 2 changed files: - gajim/common/client.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/client.py ===================================== @@ -57,7 +57,6 @@ class Client(ConnectionHandlers): self.password = None self._priority = 0 - self.handlers_registered = False self._connect_machine_calls = 0 self.avatar_conversion = False self.addressing_supported = False @@ -77,9 +76,10 @@ class Client(ConnectionHandlers): self._ssl_errors = set() + self._destroyed = False + self.available_transports = {} - # Register all modules modules.register_modules(self) self._create_client() @@ -121,6 +121,16 @@ class Client(ConnectionHandlers): self._remove_account = value def _create_client(self): + if self._destroyed: + # If we disable an account cleanup() is called and all + # modules are unregistered. Because disable_account() does not wait + # for the client to properly disconnect, handlers of the + # nbxmpp.Client() are emitted after we called cleanup(). + # After nbxmpp.Client() disconnects and is destroyed we create a + # new instance with this method but modules.get_handlers() fails + # because modules are already unregistered. + # TODO: Make this nicer + return log.info('Create new nbxmpp client') self._client = NBXMPPClient(log_context=self._account) self.connection = self._client @@ -162,7 +172,8 @@ class Client(ConnectionHandlers): self._client.subscribe('stanza-sent', self._on_stanza_sent) self._client.subscribe('stanza-received', self._on_stanza_received) - self._register_new_handlers() + for handler in modules.get_handlers(self): + self._client.register_handler(handler) def process_ssl_errors(self): if not self._ssl_errors: @@ -372,11 +383,6 @@ class Client(ConnectionHandlers): app.nec.push_incoming_event( OurShowEvent(None, conn=self, show=show)) - def _register_new_handlers(self): - for handler in modules.get_handlers(self): - self._client.register_handler(handler) - self.handlers_registered = True - def get_module(self, name): return modules.get(self._account, name) @@ -522,7 +528,8 @@ class Client(ConnectionHandlers): self._reconnect_timer_source = None def cleanup(self): - pass + self._destroyed = True + modules.unregister_modules(self) def quit(self, kill_core): if kill_core and self._state in (ClientState.CONNECTING, ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -406,13 +406,8 @@ class PluginManager(metaclass=Singleton): instance, name = module.get_instance(con) modules.register_single_module(con, instance, name) - # If handlers have been registered, register the - # plugin handlers. Otherwise this will be done - # automatically on connecting - # in connection_handlers._register_handlers() - if con.handlers_registered: - for handler in instance.handlers: - con.connection.register_handler(handler) + for handler in instance.handlers: + con.connection.register_handler(handler) def _unregister_modules_with_handlers(self, plugin): if not hasattr(plugin, 'modules'): @@ -422,11 +417,8 @@ class PluginManager(metaclass=Singleton): instance = con.get_module(module.name) modules.unregister_single_module(con, module.name) - # Account is still connected and handlers are registered - # So just unregister the plugin handlers - if con.handlers_registered: - for handler in instance.handlers: - con.connection.unregister_handler(handler) + for handler in instance.handlers: + con.connection.unregister_handler(handler) def activate_plugin(self, plugin): ''' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fe82e8874b5f904a5fcdc7780156e34… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fe82e8874b5f904a5fcdc7780156e34… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Use PEP-440 compatible version comparison
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: cc5ed8e2 by André Apitzsch at 2020-05-16T12:30:34+02:00 Use PEP-440 compatible version comparison https://www.python.org/dev/peps/pep-0440/ - - - - - d63a796a by André Apitzsch at 2020-05-16T12:30:34+02:00 Optparser: Support PEP-440 versions - - - - - 62ecb9ca by André Apitzsch at 2020-05-16T12:30:34+02:00 PluginManager: Use packaging's Version() directly - - - - - fe82e887 by André Apitzsch at 2020-05-16T12:57:00+02:00 Optparser: Remove unneeded comparison `new_version` passed to `update_config()` corresponds to the currently running version of Gajim, i.e. it's the latest version compared to the other versions mentioned in `update_config()`, that's why the conditions `V('...') <= new_version` are always true and can be removed. - - - - - 6 changed files: - flatpak/org.gajim.Gajim.yaml - gajim/common/helpers.py - gajim/common/optparser.py - gajim/gajim.py - gajim/plugins/pluginmanager.py - setup.cfg Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -49,6 +49,24 @@ cleanup: - '*.la' modules: + - name: python3-pyparsing + buildsystem: simple + build-commands: + - pip3 install --prefix=/app pyparsing-2.4.7-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/8a/bb/488841f56197b13700afd5658fc27… + sha256: ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b + + - name: python3-packaging + buildsystem: simple + build-commands: + - pip3 install --prefix=/app packaging-20.3-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/62/0a/34641d2bf5c917c96db0ded85ae4d… + sha256: 82f77b9bee21c1bafbf35a84905d604d5d1223801d639cf3ed140bd651c08752 + - name: python3-pycparser buildsystem: simple build-commands: ===================================== gajim/common/helpers.py ===================================== @@ -56,9 +56,9 @@ import urllib from urllib.parse import unquote from io import StringIO from datetime import datetime, timedelta -from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode from functools import wraps +from packaging.version import Version as V from nbxmpp.namespaces import Namespace from nbxmpp.const import Role ===================================== gajim/common/optparser.py ===================================== @@ -28,6 +28,7 @@ import sys import re import logging from pathlib import Path +from packaging.version import Version as V from gi.repository import Gdk from nbxmpp.util import text_to_color @@ -126,32 +127,25 @@ class OptionsParser: return True def update_config(self, old_version, new_version): - old_version_list = old_version.split('.') # convert '0.x.y' to (0, x, y) - old = [] - while old_version_list: - old.append(int(old_version_list.pop(0))) - new_version_list = new_version.split('.') - new = [] - while new_version_list: - new.append(int(new_version_list.pop(0))) - - if old < [0, 16, 4, 1] and new >= [0, 16, 4, 1]: + old = V(old_version) + + if old < V('0.16.4.1'): self.update_config_to_01641() - if old < [0, 16, 10, 1] and new >= [0, 16, 10, 1]: + if old < V('0.16.10.1'): self.update_config_to_016101() - if old < [0, 16, 10, 2] and new >= [0, 16, 10, 2]: + if old < V('0.16.10.2'): self.update_config_to_016102() - if old < [0, 16, 10, 4] and new >= [0, 16, 10, 4]: + if old < V('0.16.10.4'): self.update_config_to_016104() - if old < [0, 16, 10, 5] and new >= [0, 16, 10, 5]: + if old < V('0.16.10.5'): self.update_config_to_016105() - if old < [0, 98, 3] and new >= [0, 98, 3]: + if old < V('0.98.3'): self.update_config_to_0983() - if old < [1, 1, 93] and new >= [1, 1, 93]: + if old < V('1.1.93'): self.update_config_to_1193() - if old < [1, 1, 94] and new >= [1, 1, 94]: + if old < V('1.1.94'): self.update_config_to_1194() - if old < [1, 1, 95] and new >= [1, 1, 95]: + if old < V('1.1.95'): self.update_config_to_1195() app.config.set('version', new_version) ===================================== gajim/gajim.py ===================================== @@ -22,7 +22,7 @@ import signal import platform from ctypes import CDLL, byref, create_string_buffer from ctypes.util import find_library -from distutils.version import LooseVersion as V +from packaging.version import Version as V from gajim.common import i18n ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -29,7 +29,7 @@ import fnmatch import zipfile from shutil import rmtree, move import configparser -from pkg_resources import parse_version +from packaging.version import Version as V import gajim from gajim.common import app @@ -645,14 +645,14 @@ class PluginManager(metaclass=Singleton): continue gajim_v = gajim.__version__.split('+', 1)[0] - gajim_v_cmp = parse_version(gajim_v) + gajim_v_cmp = V(gajim_v) - if min_v and gajim_v_cmp < parse_version(min_v): + if min_v and gajim_v_cmp < V(min_v): log.warning('Plugin %s not loaded, newer version of' 'gajim required: %s < %s', elem_name, gajim_v, min_v) continue - if max_v and gajim_v_cmp > parse_version(max_v): + if max_v and gajim_v_cmp > V(max_v): log.warning('Plugin %s not loaded, plugin incompatible ' 'with current version of gajim: ' '%s > %s', elem_name, gajim_v, max_v) ===================================== setup.cfg ===================================== @@ -23,6 +23,7 @@ install_requires = css-parser keyring nbxmpp>=0.9.94 + packaging precis-i18n>=1.0.0 pyOpenSSL>=16.2 pycairo>=1.16.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59f0403f553655c4de9ba3e764019ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59f0403f553655c4de9ba3e764019ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Start Chat: Introduce account badges
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 368c2923 by Daniel Brötzmann at 2020-05-16T11:16:36+02:00 Start Chat: Introduce account badges - - - - - d03a45ce by Daniel Brötzmann at 2020-05-16T11:16:38+02:00 Groupchat Invite: Use account badge - - - - - 59f0403f by Daniel Brötzmann at 2020-05-16T11:16:38+02:00 ChatControl: Use account badge - - - - - 8 changed files: - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/style/gajim.css - gajim/gtk/css_config.py - gajim/gtk/groupchat_invite.py - gajim/gtk/start_chat.py - gajim/gtk/util.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -60,6 +60,7 @@ from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray from gajim.gtk.util import get_hardware_key_codes from gajim.gtk.util import get_builder +from gajim.gtk.util import generate_account_badge from gajim.gtk.const import ControlType # pylint: disable=unused-import from gajim.gtk.emoji_chooser import emoji_chooser @@ -140,11 +141,11 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self._accounts = app.get_enabled_accounts_with_labels() if len(self._accounts) > 1: - self.xml.account_image.set_tooltip_text( - app.get_account_label(self.account)) - account_class = app.css_config.get_dynamic_class(self.account) - self.xml.account_image.get_style_context().add_class(account_class) - self.xml.account_image.show() + account_badge = generate_account_badge(self.account) + account_badge.set_tooltip_text( + _('Account: %s') % app.get_account_label(self.account)) + self.xml.account_badge.add(account_badge) + account_badge.show() # Init DND self.TARGET_TYPE_URI_LIST = 80 ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">110</property> <property name="step_increment">1</property> @@ -449,6 +449,25 @@ <property name="top_attach">1</property> </packing> </child> + <child> + <object class="GtkBox" id="account_badge"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -546,20 +565,6 @@ <property name="position">5</property> </packing> </child> - <child> - <object class="GtkImage" id="account_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> - <property name="icon_name">org.gajim.Gajim-symbolic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -567,9 +572,6 @@ <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> <style> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkMenu" id="formattings_menu"> @@ -151,14 +151,17 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkImage" id="account_image"> + <object class="GtkBox" id="account_badge"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> <property name="halign">end</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> + <property name="valign">center</property> + <property name="margin_end">6</property> <property name="hexpand">True</property> - <property name="icon_name">org.gajim.Gajim-symbolic</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">0</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -260,6 +260,18 @@ button.flat.link { padding: 0; border: 0; } /*Image Preview*/ .preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } +/* Badge */ +.badge { + color: rgb(242, 242, 242); + padding-left: 6px; + padding-right: 6px; + padding-top: 2px; + padding-bottom: 2px; + border-radius: 4px; + font-size: 80%; + font-weight: bold; +} + /* Treeview */ .adhoc-treeview { padding: 5px; } .adhoc-scrolled { border: 1px solid; border-color:@unfocused_borders; } ===================================== gajim/gtk/css_config.py ===================================== @@ -538,7 +538,7 @@ class CSSConfig(): for index, account in enumerate(accounts): color = app.config.get_per('accounts', account, 'account_color') css_class = 'gajim_class_%s' % index - css += '.%s { color: %s }\n' % (css_class, color) + css += '.%s { background-color: %s }\n' % (css_class, color) self._dynamic_dict[account] = css_class self._dynamic_provider.load_from_data(css.encode()) ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -26,6 +26,7 @@ from gajim.common.const import AvatarSize from gajim.common.helpers import validate_jid from gajim.gtk.util import get_builder +from gajim.gtk.util import generate_account_badge class GroupChatInvite(Gtk.Box): @@ -296,8 +297,8 @@ class ContactRow(Gtk.ListBoxRow): image.set_size_request(AvatarSize.ROSTER, AvatarSize.ROSTER) grid.add(image) - middle_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) - middle_box.set_hexpand(True) + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + box.set_hexpand(True) if self.name is None: self.name = _('Invite New Contact') @@ -308,7 +309,18 @@ class ContactRow(Gtk.ListBoxRow): self.name_label.set_width_chars(20) self.name_label.set_halign(Gtk.Align.START) self.name_label.get_style_context().add_class('bold16') - middle_box.add(self.name_label) + name_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) + name_box.add(self.name_label) + + if show_account: + account_badge = generate_account_badge(account) + account_badge.set_tooltip_text( + _('Account: %s' % self.account_label)) + account_badge.set_halign(Gtk.Align.END) + account_badge.set_valign(Gtk.Align.START) + account_badge.set_hexpand(True) + name_box.add(account_badge) + box.add(name_box) self.jid_label = Gtk.Label(label=jid) self.jid_label.set_tooltip_text(jid) @@ -317,22 +329,9 @@ class ContactRow(Gtk.ListBoxRow): self.jid_label.set_width_chars(22) self.jid_label.set_halign(Gtk.Align.START) self.jid_label.get_style_context().add_class('dim-label') - middle_box.add(self.jid_label) - - grid.add(middle_box) - - if show_account: - account_icon = Gtk.Image.new_from_icon_name( - 'org.gajim.Gajim-symbolic', Gtk.IconSize.MENU) - account_icon.set_tooltip_text( - _('Account: %s' % self.account_label)) - account_class = app.css_config.get_dynamic_class(account) - account_icon.get_style_context().add_class(account_class) + box.add(self.jid_label) - right_box = Gtk.Box() - right_box.set_vexpand(True) - right_box.add(account_icon) - grid.add(right_box) + grid.add(box) self.add(grid) self.show_all() ===================================== gajim/gtk/start_chat.py ===================================== @@ -37,6 +37,7 @@ from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.util import get_builder from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.util import get_icon_name +from gajim.gtk.util import generate_account_badge class Search(IntEnum): @@ -136,8 +137,8 @@ class StartChatDialog(Gtk.ApplicationWindow): for bookmark in bookmarks: jid = str(bookmark.jid) name = get_groupchat_name(con, jid) - rows.append(ContactRow(account, None, jid, - name, show_account, True)) + rows.append(ContactRow(account, None, jid, name, show_account, + groupchat=True)) def _load_contacts(self, rows): generator = self._incremental_add(rows) @@ -401,7 +402,8 @@ class StartChatDialog(Gtk.ApplicationWindow): show_account = len(self._accounts) > 1 row = ContactRow(account, None, '', None, show_account) self.new_contact_rows[account] = row - group_row = ContactRow(account, None, '', None, show_account, True) + group_row = ContactRow(account, None, '', None, show_account, + groupchat=True) self.new_groupchat_rows[account] = group_row self._ui.listbox.add(row) self._ui.listbox.add(group_row) @@ -609,8 +611,8 @@ class ContactRow(Gtk.ListBoxRow): image.set_size_request(AvatarSize.CHAT, AvatarSize.CHAT) grid.add(image) - middle_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) - middle_box.set_hexpand(True) + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + box.set_hexpand(True) if self.name is None: if self.groupchat: @@ -624,7 +626,17 @@ class ContactRow(Gtk.ListBoxRow): self.name_label.set_width_chars(20) self.name_label.set_halign(Gtk.Align.START) self.name_label.get_style_context().add_class('bold16') - middle_box.add(self.name_label) + name_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) + name_box.add(self.name_label) + if show_account: + account_badge = generate_account_badge(account) + account_badge.set_tooltip_text( + _('Account: %s' % self.account_label)) + account_badge.set_halign(Gtk.Align.END) + account_badge.set_valign(Gtk.Align.START) + account_badge.set_hexpand(True) + name_box.add(account_badge) + box.add(name_box) self.jid_label = Gtk.Label(label=jid) self.jid_label.set_tooltip_text(jid) @@ -633,21 +645,9 @@ class ContactRow(Gtk.ListBoxRow): self.jid_label.set_width_chars(22) self.jid_label.set_halign(Gtk.Align.START) self.jid_label.get_style_context().add_class('dim-label') - middle_box.add(self.jid_label) - - grid.add(middle_box) + box.add(self.jid_label) - if show_account: - account_icon = Gtk.Image.new_from_icon_name( - 'org.gajim.Gajim-symbolic', Gtk.IconSize.MENU) - account_icon.set_tooltip_text( - _('Account: %s' % self.account_label)) - account_class = app.css_config.get_dynamic_class(account) - account_icon.get_style_context().add_class(account_class) - right_box = Gtk.Box() - right_box.set_vexpand(True) - right_box.add(account_icon) - grid.add(right_box) + grid.add(box) self.add(grid) self.show_all() ===================================== gajim/gtk/util.py ===================================== @@ -660,6 +660,19 @@ def get_color_for_account(account: str) -> str: return rgba.to_string() +def generate_account_badge(account): + account_label = app.get_account_label(account) + badge = Gtk.Label(label=account_label) + badge.set_ellipsize(Pango.EllipsizeMode.END) + badge.set_max_width_chars(12) + badge.set_size_request(50, -1) + account_class = app.css_config.get_dynamic_class(account) + badge_context = badge.get_style_context() + badge_context.add_class(account_class) + badge_context.add_class('badge') + return badge + + @lru_cache(maxsize=16) def get_css_show_class(show): if show in ('online', 'chat'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0eef5cc126fcd80b144873f7389c88… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0eef5cc126fcd80b144873f7389c88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] IPython: Simplify code
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c0eef5cc by André Apitzsch at 2020-05-16T06:55:21+02:00 IPython: Simplify code IPython 6.5 is the first version that is Python 3.7 compatible. https://ipython.readthedocs.io/en/stable/whatsnew/version6.html#ipython-6-5… - - - - - 1 changed file: - gajim/dev/ipython_view.py Changes: ===================================== gajim/dev/ipython_view.py ===================================== @@ -61,7 +61,6 @@ import sys import os from io import StringIO from functools import reduce -from pkg_resources import parse_version from gi.repository import Gtk from gi.repository import Gdk @@ -170,12 +169,6 @@ class IterableIPShell: # Workaround for updating namespace with sys.modules # self.__update_namespace() - - # Avoid using input splitter when not really needed. - # Perhaps it could work even before 5.8.0 - # But it definitely does not work any more with >= 7.0.0 - self.no_input_splitter = parse_version(IPython.release.version) >= \ - parse_version('5.8.0') self.lines = [] def __update_namespace(self): @@ -208,28 +201,21 @@ class IterableIPShell: self.IP.rl_do_indent = True try: - line = self.IP.raw_input(self.prompt) + self.IP.raw_input(self.prompt) except KeyboardInterrupt: self.IP.write('\nKeyboardInterrupt\n') self.IP.input_splitter.reset() except Exception: self.IP.showtraceback() else: - if self.no_input_splitter: - self.lines.append(self.IP.raw_input(self.prompt)) - self.iter_more = self.IP.check_complete( - '\n'.join(self.lines))[0] == 'incomplete' - else: - self.IP.input_splitter.push(line) - self.iter_more = self.IP.input_splitter.push_accepts_more() + self.lines.append(self.IP.raw_input(self.prompt)) + self.iter_more = self.IP.check_complete( + '\n'.join(self.lines))[0] == 'incomplete' self.prompt = self.generatePrompt(self.iter_more) if not self.iter_more: - if self.no_input_splitter: - source_raw = '\n'.join(self.lines) - self.lines = [] - else: - source_raw = self.IP.input_splitter.raw_reset() + source_raw = '\n'.join(self.lines) + self.lines = [] self.IP.run_cell(source_raw, store_history=True) self.IP.rl_do_indent = False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0eef5cc126fcd80b144873f7389c88c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0eef5cc126fcd80b144873f7389c88c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add shortcut for shortcuts window
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f3c8630 by André Apitzsch at 2020-05-16T00:15:34+02:00 Add shortcut for shortcuts window Follow https://gitlab.gnome.org/GNOME/Initiatives/-/issues/14 - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== @@ -545,6 +545,7 @@ class GajimApplication(Gtk.Application): def _set_shortcuts(self): shortcuts = { 'app.quit': ['<Primary>Q'], + 'app.shortcuts': ['<Primary>question'], 'app.preferences': ['<Primary>P'], 'app.plugins': ['<Primary>E'], 'app.xml-console': ['<Primary><Shift>X'], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f3c86305c1342e83f03324d1a8053fc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f3c86305c1342e83f03324d1a8053fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove legacy cairo code
by Philipp Hörist 14 May '20

14 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e450ec35 by André Apitzsch at 2020-05-14T23:08:55+02:00 Remove legacy cairo code - - - - - 3 changed files: - gajim/gajim.py - gajim/gtk/avatar.py - setup.cfg Changes: ===================================== gajim/gajim.py ===================================== @@ -28,7 +28,7 @@ from gajim.common import i18n _MIN_NBXMPP_VER = '0.9.94' _MIN_GTK_VER = '3.22.27' -_MIN_CAIRO_VER = '1.14.0' +_MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' ===================================== gajim/gtk/avatar.py ===================================== @@ -52,7 +52,7 @@ def generate_avatar(letters, color, size, scale): font_size = size * 0.5 # Set up surface - surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) context = cairo.Context(surface) context.set_source_rgb(color_r, color_g, color_b) @@ -61,26 +61,20 @@ def generate_avatar(letters, color, size, scale): # Draw letters context.select_font_face('sans-serif', - cairo.FONT_SLANT_NORMAL, - cairo.FONT_WEIGHT_NORMAL) + cairo.FontSlant.NORMAL, + cairo.FontWeight.NORMAL) context.set_font_size(font_size) extends = context.text_extents(letters) - if isinstance(extends, tuple): - # For cairo < 1.15 - x_bearing, y_bearing, ex_width, ex_height = extends[0:4] - else: - x_bearing = extends.x_bearing - y_bearing = extends.y_bearing - ex_width = extends.width - ex_height = extends.height + x_bearing = extends.x_bearing + y_bearing = extends.y_bearing + ex_width = extends.width + ex_height = extends.height x_pos = width / 2 - (ex_width / 2 + x_bearing) y_pos = height / 2 - (ex_height / 2 + y_bearing) context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) - # use cairo.OPERATOR_OVER legacy constant because its - # compatible with cairo < 1.13 - context.set_operator(cairo.OPERATOR_OVER) + context.set_operator(cairo.Operator.OVER) context.show_text(letters) return context.get_target() @@ -90,7 +84,7 @@ def add_status_to_avatar(surface, show): width = surface.get_width() height = surface.get_height() - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + new_surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) new_surface.set_device_scale(*surface.get_device_scale()) scale = surface.get_device_scale()[0] @@ -128,7 +122,7 @@ def square(surface, size): if width == height: return surface - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, size, size) + new_surface = cairo.ImageSurface(cairo.Format.ARGB32, size, size) new_surface.set_device_scale(*surface.get_device_scale()) context = cairo.Context(new_surface) @@ -147,7 +141,7 @@ def square(surface, size): def clip_circle(surface): - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, + new_surface = cairo.ImageSurface(cairo.Format.ARGB32, surface.get_width(), surface.get_height()) ===================================== setup.cfg ===================================== @@ -25,7 +25,7 @@ install_requires = nbxmpp>=0.9.94 precis-i18n>=1.0.0 pyOpenSSL>=16.2 - pycairo>=1.14.0 + pycairo>=1.16.0 [options.package_data] gajim = View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e450ec352e1a763d33e5455d258e2eb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e450ec352e1a763d33e5455d258e2eb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add DTLS-SRTP namespace (XEP-320)
by Philipp Hörist 13 May '20

13 May '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ae1ebadd by André Apitzsch at 2020-05-12T23:30:50+02:00 Add DTLS-SRTP namespace (XEP-320) - - - - - 1 changed file: - nbxmpp/namespaces.py Changes: ===================================== nbxmpp/namespaces.py ===================================== @@ -81,6 +81,7 @@ class _Namespaces: IDLE: str = 'urn:xmpp:idle:1' JINGLE: str = 'urn:xmpp:jingle:1' JINGLE_BYTESTREAM: str = 'urn:xmpp:jingle:transports:s5b:1' + JINGLE_DTLS: str = 'urn:xmpp:jingle:apps:dtls:0' JINGLE_ERRORS: str = 'urn:xmpp:jingle:errors:1' JINGLE_FILE_TRANSFER: str = 'urn:xmpp:jingle:apps:file-transfer:3' JINGLE_FILE_TRANSFER_5: str = 'urn:xmpp:jingle:apps:file-transfer:5' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ae1ebaddb949e5b74c34e22f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ae1ebaddb949e5b74c34e22f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Add a codespell ignore list
by Philipp Hörist 13 May '20

13 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8dcf632f by Emmanuel Gil Peyrot at 2020-05-13T23:25:21+02:00 Add a codespell ignore list - - - - - c3511db9 by Emmanuel Gil Peyrot at 2020-05-13T23:25:21+02:00 Add a CI pass for codespell This avoids future typos. - - - - - c0785403 by Emmanuel Gil Peyrot at 2020-05-13T23:25:21+02:00 Remove � characters from emoji data - - - - - e23cbe36 by Emmanuel Gil Peyrot at 2020-05-13T23:25:21+02:00 Fix typos Thanks codespell! - - - - - 30 changed files: - .gitlab-ci.yml - + codespell.conf - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/contacts.py - gajim/common/exceptions.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/common/jingle_xtls.py - gajim/common/logger.py - gajim/common/logging_helpers.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/base.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/blocking.py - gajim/common/modules/bytestream.py - gajim/common/modules/chatstates.py - gajim/common/modules/entity_time.py - gajim/common/modules/httpupload.py - gajim/common/modules/jingle.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/privacylists.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f261b49561adda5e5c9785f1e863a66… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f261b49561adda5e5c9785f1e863a66… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Contacts: Don't delete list while reading it
by Philipp Hörist 13 May '20

13 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f261b495 by André Apitzsch at 2020-05-13T22:17:33+02:00 Contacts: Don't delete list while reading it - - - - - 1 changed file: - gajim/common/contacts.py Changes: ===================================== gajim/common/contacts.py ===================================== @@ -670,7 +670,7 @@ class Contacts(): for _contact in self._contacts[old_jid]: _contact.jid = new_jid self._contacts[new_jid].append(_contact) - del self._contacts[old_jid] + del self._contacts[old_jid] def get_combined_chatstate(self, jid): if jid not in self._contacts: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f261b49561adda5e5c9785f1e863a66a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f261b49561adda5e5c9785f1e863a66a… 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 May 2020