Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] HTTPUpload: Display errors correctly
by Philipp Hörist 20 Dec '20

20 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a7af2daf by lovetox at 2020-12-20T17:06:18+01:00 HTTPUpload: Display errors correctly - - - - - 2 changed files: - gajim/common/modules/httpupload.py - gajim/gtk/filetransfer_progress.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -110,7 +110,7 @@ def make_transfer(self, path, encryption, contact, groupchat=False): 'maximum allowed file size is: %s') % size if invalid_file: - raise FileError('file-error', msg) + raise FileError(msg) mime = mimetypes.MimeTypes().guess_type(path)[0] if not mime: ===================================== gajim/gtk/filetransfer_progress.py ===================================== @@ -59,7 +59,9 @@ def __init__(self, transfer): def _on_transfer_state_change(self, transfer, _signal_name, state): if state.is_error: - ErrorDialog(_('Upload Failed'), transfer.error_text) + ErrorDialog(_('Upload Failed'), + transfer.error_text, + transient_for=app.interface.roster.window) self.destroy() if state.is_finished or state.is_cancelled: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a7af2dafec2288f0003f1931cbf8420b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a7af2dafec2288f0003f1931cbf8420b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HTTPUpload: Separate transfer from sending message
by Philipp Hörist 20 Dec '20

20 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a290db02 by lovetox at 2020-12-20T16:35:11+01:00 HTTPUpload: Separate transfer from sending message - - - - - 9 changed files: - gajim/chat_control_base.py - gajim/common/const.py - gajim/common/exceptions.py - gajim/common/filetransfer.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/dialog_messages.py - gajim/gtk/filetransfer_progress.py - gajim/gui_interface.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -814,14 +814,8 @@ def _start_filetransfer(self, path): if method is None: return - con = app.connections[self.account] - if method == 'httpupload': - con.get_module('HTTPUpload').check_file_before_transfer( - path, - self.encryption, - self.contact, - groupchat=self._type.is_groupchat) + app.interface.send_httpupload(self, path) else: ft = app.interface.instances['file_transfers'] ===================================== gajim/common/const.py ===================================== @@ -908,6 +908,7 @@ class FTState(Enum): IN_PROGRESS = 'progress' FINISHED = 'finished' ERROR = 'error' + CANCELLED = 'cancelled' @property def is_preparing(self): @@ -937,6 +938,16 @@ def is_finished(self): def is_error(self): return self == FTState.ERROR + @property + def is_cancelled(self): + return self == FTState.CANCELLED + + @property + def is_active(self): + return not (self.is_error or + self.is_cancelled or + self.is_finished) + SASL_ERRORS = { 'aborted': _('Authentication aborted'), ===================================== gajim/common/exceptions.py ===================================== @@ -151,3 +151,7 @@ def __str__(self): class SendMessageError(Exception): pass + + +class FileError(Exception): + pass ===================================== gajim/common/filetransfer.py ===================================== @@ -21,22 +21,26 @@ class FileTransfer(Observable): _state_descriptions = {} # type: Dict[FTState, str] - def __init__(self, account, cancel_func=None): + def __init__(self, account): Observable.__init__(self) self._account = account - self._cancel_func = cancel_func self._seen = 0 self.size = 0 self._state = None self._error_text = '' + self._error_domain = None @property def account(self): return self._account + @property + def state(self): + return self._state + @property def seen(self): return self._seen @@ -51,9 +55,13 @@ def is_complete(self): def filename(self): raise NotImplementedError - def cancel(self): - if self._cancel_func is not None: - self._cancel_func(self) + @property + def error_text(self): + return self._error_text + + @property + def error_domain(self): + return self._error_domain def get_state_description(self): return self._state_descriptions.get(self._state, '') @@ -74,12 +82,18 @@ def set_started(self): self._state = FTState.STARTED self.notify('state-changed', FTState.STARTED) - def set_error(self, text=''): + def set_error(self, domain, text=''): self._error_text = text + self._error_domain = domain self._state = FTState.ERROR self.notify('state-changed', FTState.ERROR) self.disconnect_signals() + def set_cancelled(self): + self._state = FTState.CANCELLED + self.notify('state-changed', FTState.CANCELLED) + self.disconnect_signals() + def set_in_progress(self): self._state = FTState.IN_PROGRESS self.notify('state-changed', FTState.IN_PROGRESS) ===================================== gajim/common/helpers.py ===================================== @@ -45,6 +45,7 @@ from collections import defaultdict import random import weakref +import inspect import string from string import Template import urllib @@ -1256,7 +1257,11 @@ def disconnect(self, object_): self._callbacks[signal_name].remove(handler) def connect(self, signal_name, func): - weak_func = weakref.WeakMethod(func) + if inspect.ismethod(func): + weak_func = weakref.WeakMethod(func) + elif inspect.isfunction(func): + weak_func = weakref.ref(func) + self._callbacks[signal_name].append(weak_func) def notify(self, signal_name, *args, **kwargs): ===================================== gajim/common/modules/httpupload.py ===================================== @@ -35,8 +35,7 @@ from gajim.common.const import FTState from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule -from gajim.common.structs import OutgoingMessage -from gajim.common.connection_handlers_events import InformationEvent +from gajim.common.exceptions import FileError class HTTPUpload(BaseModule): @@ -87,10 +86,9 @@ def pass_disco(self, info): for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): ctrl.update_actions() - def check_file_before_transfer(self, path, encryption, contact, - groupchat=False): + def make_transfer(self, path, encryption, contact, groupchat=False): if not path or not os.path.exists(path): - return + return None invalid_file = False stat = os.stat(path) @@ -112,47 +110,41 @@ def check_file_before_transfer(self, path, encryption, contact, 'maximum allowed file size is: %s') % size if invalid_file: - self._raise_information_event('open-file-error2', msg) - return + raise FileError('file-error', msg) mime = mimetypes.MimeTypes().guess_type(path)[0] if not mime: mime = 'application/octet-stream' # fallback mime type self._log.info("Detected MIME type of file: %s", mime) - try: - transfer = HTTPFileTransfer(self._account, - self._cancel_upload, - path, - contact, - mime, - encryption, - groupchat) - app.interface.show_httpupload_progress(transfer) - except Exception as error: - self._log.exception('Error while loading file') - self._raise_information_event('open-file-error2', str(error)) - return - - if encryption is not None: - app.interface.encrypt_file(transfer, - self._account, - self._request_slot) - else: - self._request_slot(transfer) + return HTTPFileTransfer(self._account, + path, + contact, + mime, + encryption, + groupchat) - def _cancel_upload(self, transfer): + def cancel_transfer(self, transfer): + transfer.set_cancelled() message = self._queued_messages.get(id(transfer)) if message is None: return + self._session.cancel_message(message, Soup.Status.CANCELLED) - @staticmethod - def _raise_information_event(dialog_name, args=None): - app.nec.push_incoming_event(InformationEvent( - None, dialog_name=dialog_name, args=args)) + def start_transfer(self, transfer): + if transfer.encryption is not None and not transfer.is_encrypted: + transfer.set_encrypting() + plugin = app.plugin_manager.encryption_plugins[transfer.encryption] + if hasattr(plugin, 'encrypt_file'): + plugin.encrypt_file(transfer, + self._account, + self.start_transfer) + else: + transfer.set_error('encryption-not-available') + + return - def _request_slot(self, transfer): transfer.set_preparing() self._log.info('Sending request for slot') self._nbxmpp('HTTPUpload').request_slot( @@ -172,8 +164,6 @@ def _received_slot(self, task): HTTPUploadStanzaError, MalformedStanzaError) as error: - transfer.set_error() - if error.app_condition == 'file-too-large': size_text = GLib.format_size_full( error.get_max_file_size(), @@ -181,20 +171,18 @@ def _received_slot(self, task): error_text = _('File is too large, ' 'maximum allowed file size is: %s' % size_text) + transfer.set_error('file-too-large', error_text) + else: - error_text = str(error) - self._log.warning(error) + transfer.set_error('misc', str(error)) - self._raise_information_event('request-upload-slot-error', - error_text) return transfer.process_result(result) if (urlparse(transfer.put_uri).scheme != 'https' or urlparse(transfer.get_uri).scheme != 'https'): - transfer.set_error() - self._raise_information_event('unsecure-error') + transfer.set_error('unsecure') return self._log.info('Uploading file to %s', transfer.put_uri) @@ -206,7 +194,7 @@ def _upload_file(self, transfer): transfer.set_started() message = Soup.Message.new('PUT', transfer.put_uri) - message.connect('starting', self._check_certificate) + message.connect('starting', self._check_certificate, transfer) # Set CAN_REBUILD so chunks get discarded after they have been # written to the network @@ -227,10 +215,11 @@ def _upload_file(self, transfer): self._set_proxy_if_available() self._session.queue_message(message, self._on_finish, transfer) - def _check_certificate(self, message): + def _check_certificate(self, message, transfer): https_used, tls_certificate, tls_errors = message.get_https_status() if not https_used: self._log.warning('HTTPS was not used for upload') + transfer.set_error('unsecure') self._session.cancel_message(message, Soup.Status.CANCELLED) return @@ -241,12 +230,12 @@ def _check_certificate(self, message): for error in tls_errors: phrase = get_tls_error_phrase(error) self._log.warning('TLS verification failed: %s', phrase) + + transfer.set_error('tls-verification-failed', phrase) self._session.cancel_message(message, Soup.Status.CANCELLED) - self._raise_information_event('httpupload-error', phrase) def _on_finish(self, _session, message, transfer): self._queued_messages.pop(id(transfer), None) - transfer.set_finished() if message.props.status_code == Soup.Status.CANCELLED: self._log.info('Upload cancelled') @@ -254,25 +243,14 @@ def _on_finish(self, _session, message, transfer): if message.props.status_code in (Soup.Status.OK, Soup.Status.CREATED): self._log.info('Upload completed successfully') - uri = transfer.get_transformed_uri() + transfer.set_finished() - type_ = 'chat' - if transfer.is_groupchat: - type_ = 'groupchat' - - message = OutgoingMessage(account=self._account, - contact=transfer.contact, - message=uri, - type_=type_, - oob_url=uri) - - self._con.send_message(message) else: phrase = Soup.Status.get_phrase(message.props.status_code) self._log.error('Got unexpected http upload response code: %s', phrase) - self._raise_information_event('httpupload-response-error', phrase) + transfer.set_error('http-response', phrase) def _on_wrote_chunk(self, message, transfer): transfer.update_progress() @@ -303,15 +281,21 @@ class HTTPFileTransfer(FileTransfer): FTState.STARTED: _('Uploading via HTTP File Upload…'), } + _errors = { + 'unsecure': _('The server returned an insecure transport (HTTP).'), + 'encryption-not-available': _('There is no encryption method available ' + 'for the chosen encryption.') + } + def __init__(self, account, - cancel_func, path, contact, mime, encryption, groupchat): - FileTransfer.__init__(self, account, cancel_func=cancel_func) + + FileTransfer.__init__(self, account) self._path = path self._encryption = encryption @@ -328,6 +312,8 @@ def __init__(self, self._data = None self._headers = {} + self._is_encrypted = False + @property def mime(self): return self._mime @@ -352,6 +338,10 @@ def headers(self): def path(self): return self._path + @property + def is_encrypted(self): + return self._is_encrypted + def get_transformed_uri(self): if self._uri_transform_func is not None: return self._uri_transform_func(self.get_uri) @@ -364,9 +354,12 @@ def set_uri_transform_func(self, func): def filename(self): return os.path.basename(self._path) - def set_error(self, text=''): + def set_error(self, domain, text=''): + if not text: + text = self._errors[domain] + self._close() - super().set_error(text) + super().set_error(domain, text) def set_finished(self): self._close() @@ -374,6 +367,7 @@ def set_finished(self): def set_encrypted_data(self, data): self._data = data + self._is_encrypted = True def _close(self): if self._stream is not None: ===================================== gajim/dialog_messages.py ===================================== @@ -97,42 +97,11 @@ _('%s\nLink-local messaging might not work properly.'), ErrorDialog), - 'request-upload-slot-error': Message( - _('Could not request upload slot for HTTP File Upload'), - '%s', - ErrorDialog), - - 'open-file-error': Message( - _('Could not Open File'), - _('Exception raised while trying to open file (see log).'), - ErrorDialog), - 'open-file-error2': Message( _('Could not Open File'), '%s', ErrorDialog), - 'unsecure-error': Message( - _('Not Secure'), - _('The server returned an insecure transport (HTTP).'), - ErrorDialog), - - 'httpupload-response-error': Message( - _('Could not Upload File'), - _('HTTP response code from server: %s'), - ErrorDialog), - - 'httpupload-error': Message( - _('Upload Error'), - '%s', - ErrorDialog), - - 'httpupload-encryption-not-available': Message( - _('Encryption Error'), - _('There is no encryption method available ' - 'for the chosen encryption.'), - ErrorDialog), - } ===================================== gajim/gtk/filetransfer_progress.py ===================================== @@ -22,6 +22,7 @@ from .util import get_builder from .util import EventHelper +from .dialogs import ErrorDialog class FileTransferProgress(Gtk.ApplicationWindow, EventHelper): @@ -57,7 +58,11 @@ def __init__(self, transfer): self._ui.connect_signals(self) def _on_transfer_state_change(self, transfer, _signal_name, state): - if state.is_finished or state.is_error: + if state.is_error: + ErrorDialog(_('Upload Failed'), transfer.error_text) + self.destroy() + + if state.is_finished or state.is_cancelled: self.destroy() return @@ -73,8 +78,10 @@ def _on_cancel_button_clicked(self, _widget): self.destroy() def _on_destroy(self, *args): - self._transfer.cancel() - self._transfer.disconnect(self) + if self._transfer.state.is_active: + client = app.get_client(self._transfer.account) + client.get_module('HTTPUpload').cancel_transfer(self._transfer) + self._transfer = None self._destroyed = True if self._pulse is not None: ===================================== gajim/gui_interface.py ===================================== @@ -77,6 +77,7 @@ from gajim.common.helpers import ask_for_status_message from gajim.common.helpers import get_group_chat_nick from gajim.common.structs import MUCData +from gajim.common.structs import OutgoingMessage from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.client import Client @@ -84,9 +85,11 @@ from gajim.common.const import JingleState from gajim.common.file_props import FilesProp +from gajim.common.connection_handlers_events import InformationEvent from gajim import roster_window from gajim.common import ged +from gajim.common.exceptions import FileError from gajim.gui.avatar import AvatarStorage from gajim.gui.notification import Notification @@ -849,34 +852,55 @@ def handle_event_signed_in(self, obj): if ask_for_status_message(obj.conn.status, signin=True): open_window('StatusChange', status=obj.conn.status) - @staticmethod - def show_httpupload_progress(transfer): - FileTransferProgress(transfer) + def send_httpupload(self, chat_control, path=None): + if path is not None: + self._send_httpupload(chat_control, path) + return - def send_httpupload(self, chat_control): accept_cb = partial(self.on_file_dialog_ok, chat_control) FileChooserDialog(accept_cb, select_multiple=True, transient_for=chat_control.parent_win.window) - @staticmethod - def on_file_dialog_ok(chat_control, paths): - con = app.connections[chat_control.account] + def on_file_dialog_ok(self, chat_control, paths): for path in paths: - con.get_module('HTTPUpload').check_file_before_transfer( + self._send_httpupload(chat_control, path) + + def _send_httpupload(self, chat_control, path): + con = app.connections[chat_control.account] + try: + transfer = con.get_module('HTTPUpload').make_transfer( path, chat_control.encryption, chat_control.contact, chat_control.is_groupchat) + except FileError as error: + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='open-file-error2', args=error)) + return - def encrypt_file(self, transfer, account, callback): - transfer.set_encrypting() - plugin = app.plugin_manager.encryption_plugins[transfer.encryption] - if hasattr(plugin, 'encrypt_file'): - plugin.encrypt_file(transfer, account, callback) - else: - transfer.set_error() - self.raise_dialog('httpupload-encryption-not-available') + transfer.connect('state-changed', + self._on_http_upload_state_changed) + FileTransferProgress(transfer) + con.get_module('HTTPUpload').start_transfer(transfer) + + @staticmethod + def _on_http_upload_state_changed(transfer, _signal_name, state): + if state.is_finished: + uri = transfer.get_transformed_uri() + + type_ = 'chat' + if transfer.is_groupchat: + type_ = 'groupchat' + + message = OutgoingMessage(account=transfer.account, + contact=transfer.contact, + message=uri, + type_=type_, + oob_url=uri) + + client = app.get_client(transfer.account) + client.send_message(message) @staticmethod def handle_event_metacontacts(obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a290db02c14bc62b2148d49e6070600e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a290db02c14bc62b2148d49e6070600e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] SideBarSwitcher: Enable vexpand
by Daniel Brötzmann 17 Dec '20

17 Dec '20

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d54f28f9 by Daniel Brötzmann at 2020-12-17T14:31:14+01:00 SideBarSwitcher: Enable vexpand Fixes #10359 - - - - - 1 changed file: - gajim/gtk/sidebar_switcher.py Changes: ===================================== gajim/gtk/sidebar_switcher.py ===================================== @@ -19,9 +19,10 @@ class SideBarSwitcher(Gtk.ListBox): def __init__(self): Gtk.ListBox.__init__(self) - self._stack = None + self.set_vexpand(True) self.get_style_context().add_class('settings-menu') self.connect('row-activated', self._on_row_activated) + self._stack = None def set_stack(self, stack): self._stack = stack View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d54f28f938af2d655cf659ef942e5346… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d54f28f938af2d655cf659ef942e5346… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Add metcontacts_enabled to ACE
by Philipp Hörist 09 Dec '20

09 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d9a7aa04 by lovetox at 2020-12-09T15:34:32+01:00 Settings: Add metcontacts_enabled to ACE - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -461,6 +461,7 @@ class _ACCOUNT_DEFAULT: 'dev_force_bookmark_2': _('Force Bookmark 2 usage'), 'gc_notify_on_all_messages_private_default': '', 'gc_notify_on_all_messages_public_default': '', + 'metacontacts_enabled': '', }, } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d9a7aa04dbef4ecdc67f1c22b922051c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d9a7aa04dbef4ecdc67f1c22b922051c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GUI: Improve finding modules
by Philipp Hörist 08 Dec '20

08 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 720855a0 by Philipp Hörist at 2020-12-08T07:21:33+01:00 GUI: Improve finding modules - - - - - 1 changed file: - gajim/gui/__init__.py Changes: ===================================== gajim/gui/__init__.py ===================================== @@ -13,26 +13,41 @@ def __init__(self, name, fallback=None): if fallback is not None: self._fallback_path = Path(__file__).parent.parent / fallback - self._suffix = 'pyc' if sys.platform == 'win32' else 'py' - def find_spec(self, fullname, _path, _target=None): if not fullname.startswith('gajim.gui'): return None _namespace, module_name = fullname.rsplit('.', 1) - module_path = self._path / f'{module_name}.{self._suffix}' - - if not module_path.exists(): - if self._fallback_path is None: - return None - - module_path = self._fallback_path / f'{module_name}.{self._suffix}' - if not module_path.exists(): - return None + module_path = self._find_module(module_name) + if module_path is None: + return None spec = importlib.util.spec_from_file_location(fullname, module_path) return spec + def _find_module(self, module_name): + module_path = self._path / f'{module_name}.py' + if module_path.exists(): + return module_path + + module_path = self._path / f'{module_name}.pyc' + if module_path.exists(): + return module_path + + if self._fallback_path is None: + return None + + module_path = self._fallback_path / f'{module_name}.py' + if module_path.exists(): + return module_path + + module_path = self._fallback_path / f'{module_name}.pyc' + if module_path.exists(): + return module_path + + return None + + def init(name, fallback=None): sys.meta_path.append(GUIFinder(name, fallback=fallback)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/720855a004d42e65175fe5bb68f88993… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/720855a004d42e65175fe5bb68f88993… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update dev_env.sh
by Philipp Hörist 06 Dec '20

06 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 88376197 by Philipp Hörist at 2020-12-06T14:08:13+01:00 Update dev_env.sh - - - - - 1 changed file: - win/dev_env.sh Changes: ===================================== win/dev_env.sh ===================================== @@ -5,19 +5,19 @@ set -e function main { pacman --noconfirm -S --needed \ git \ - mingw-w64-x86_64-python3 \ - mingw-w64-x86_64-python3-gobject \ - mingw-w64-x86_64-python3-pip \ + mingw-w64-x86_64-python \ + mingw-w64-x86_64-python-gobject \ + mingw-w64-x86_64-python-pip \ mingw-w64-x86_64-toolchain \ mingw-w64-x86_64-adwaita-icon-theme \ mingw-w64-x86_64-gtk3 \ - mingw-w64-x86_64-python3-setuptools-scm \ - mingw-w64-x86_64-python3-cryptography \ - mingw-w64-x86_64-python3-certifi \ - mingw-w64-x86_64-python3-pyopenssl \ - mingw-w64-x86_64-python3-pillow \ - mingw-w64-x86_64-python3-six \ - mingw-w64-x86_64-python3-pygments \ + mingw-w64-x86_64-python-setuptools-scm \ + mingw-w64-x86_64-python-cryptography \ + mingw-w64-x86_64-python-certifi \ + mingw-w64-x86_64-python-pyopenssl \ + mingw-w64-x86_64-python-pillow \ + mingw-w64-x86_64-python-six \ + mingw-w64-x86_64-python-pygments \ mingw-w64-x86_64-libwebp \ mingw-w64-x86_64-goocanvas \ mingw-w64-x86_64-gspell \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88376197854199ecacf2afca2d479e25… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88376197854199ecacf2afca2d479e25… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Tests: Init GUI
by Philipp Hörist 06 Dec '20

06 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: baf29641 by lovetox at 2020-12-06T13:15:54+01:00 Tests: Init GUI - - - - - 1 changed file: - test/gtk/change_password.py Changes: ===================================== test/gtk/change_password.py ===================================== @@ -9,6 +9,9 @@ from gajim.common.const import CSSPriority +from gajim import gui +gui.init('gtk') + from gajim.gui.change_password import ChangePassword from test.gtk import util View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/baf29641cbe14cd98fbbfb6e370be80a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/baf29641cbe14cd98fbbfb6e370be80a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Tests: Init ǴUI
by Philipp Hörist 06 Dec '20

06 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2f4f2814 by lovetox at 2020-12-06T07:56:57+01:00 Tests: Init ǴUI - - - - - 8 changed files: - test/gtk/assistant.py - test/gtk/certificate_dialog.py - test/gtk/dataform.py - test/gtk/fake_dataform.py - test/gtk/groupchat_info.py - test/gtk/htmltextview.py - test/gtk/ssl_error_dialog.py - test/no_gui/unit/test_nick_completion.py Changes: ===================================== test/gtk/assistant.py ===================================== @@ -4,6 +4,9 @@ from gajim.common.const import CSSPriority +from gajim import gui +gui.init('gtk') + from gajim.gui.assistant import Assistant from gajim.gui.assistant import Page ===================================== test/gtk/certificate_dialog.py ===================================== @@ -4,6 +4,9 @@ import OpenSSL +from gajim import gui +gui.init('gtk') + from test.gtk import util from gajim.common.const import CSSPriority from gajim.gui.dialogs import CertificateDialog ===================================== test/gtk/dataform.py ===================================== @@ -4,6 +4,9 @@ import nbxmpp from nbxmpp.modules.dataforms import extend_form +from gajim import gui +gui.init('gtk') + from gajim.gui.dataform import DataFormWidget from gajim.common.const import CSSPriority from gajim.common import app ===================================== test/gtk/fake_dataform.py ===================================== @@ -1,5 +1,8 @@ from gi.repository import Gtk +from gajim import gui +gui.init('gtk') + from gajim.gui.dataform import FakeDataFormWidget from gajim.common.const import CSSPriority ===================================== test/gtk/groupchat_info.py ===================================== @@ -9,6 +9,9 @@ from gajim.common.const import CSSPriority +from gajim import gui +gui.init('gtk') + from test.gtk import util from gajim.gui.groupchat_info import GroupChatInfoScrolled ===================================== test/gtk/htmltextview.py ===================================== @@ -9,6 +9,9 @@ configpaths.init() from gajim.common.helpers import AdditionalDataDict +from gajim import gui +gui.init('gtk') + from gajim.conversation_textview import ConversationTextview from gajim.gui_interface import Interface ===================================== test/gtk/ssl_error_dialog.py ===================================== @@ -4,6 +4,9 @@ import OpenSSL +from gajim import gui +gui.init('gtk') + from test.gtk import util from gajim.common.const import CSSPriority from gajim.gui.ssl_error_dialog import SSLErrorDialog ===================================== test/no_gui/unit/test_nick_completion.py ===================================== @@ -1,5 +1,7 @@ import unittest +from gajim import gui +gui.init('gtk') from gajim.gui.util import NickCompletionGenerator class Test(unittest.TestCase): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2f4f28141a5ce80eb8e11ccdc97aa043… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2f4f28141a5ce80eb8e11ccdc97aa043… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add custom module load for GUI
by Philipp Hörist 05 Dec '20

05 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4899b78c by lovetox at 2020-12-05T22:49:20+01:00 Add custom module load for GUI - - - - - ef217f20 by lovetox at 2020-12-05T22:57:08+01:00 Make imports GUI agnostic - - - - - 30 changed files: - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/client.py - gajim/conversation_textview.py - gajim/dialog_messages.py - gajim/dialogs.py - gajim/gajim.py - gajim/groupchat_control.py - gajim/gtk/account_wizard.py - gajim/gtk/accounts.py - gajim/gtk/add_contact.py - gajim/gtk/adhoc.py - gajim/gtk/advanced_config.py - gajim/gtk/assistant.py - gajim/gtk/avatar.py - gajim/gtk/avatar_selector.py - gajim/gtk/blocking.py - gajim/gtk/bookmarks.py - gajim/gtk/change_password.py - gajim/gtk/const.py - gajim/gtk/css_config.py - gajim/gtk/dataform.py - gajim/gtk/dialogs.py - gajim/gtk/discovery.py - gajim/gtk/emoji_chooser.py - gajim/gtk/exception.py - gajim/gtk/filechoosers.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9d4c947b33f81600f57e42af5ba8267… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9d4c947b33f81600f57e42af5ba8267… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Use idle monitor only if available
by Philipp Hörist 03 Dec '20

03 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1609d931 by André Apitzsch at 2020-12-03T18:04:28+01:00 Use idle monitor only if available Fixes #10295. - - - - - 9d4c947b by André Apitzsch at 2020-12-03T18:22:52+01:00 Ignore Xss idle monitor on wayland Wayland doesn't provide XScreenSaver Extension. - - - - - 2 changed files: - gajim/common/client.py - gajim/common/idle.py Changes: ===================================== gajim/common/client.py ===================================== @@ -84,11 +84,11 @@ def __init__(self, account): self._create_client() - self._idle_handler_id = Monitor.connect('state-changed', - self._idle_state_changed) - - self._screensaver_handler_id = app.app.connect( - 'notify::screensaver-active', self._screensaver_state_changed) + if Monitor.is_available(): + self._idle_handler_id = Monitor.connect('state-changed', + self._idle_state_changed) + self._screensaver_handler_id = app.app.connect( + 'notify::screensaver-active', self._screensaver_state_changed) ConnectionHandlers.__init__(self) @@ -615,8 +615,9 @@ def _screensaver_state_changed(application, _param): def cleanup(self): self._destroyed = True - Monitor.disconnect(self._idle_handler_id) - app.app.disconnect(self._screensaver_handler_id) + if Monitor.is_available(): + Monitor.disconnect(self._idle_handler_id) + app.app.disconnect(self._screensaver_handler_id) if self._client is not None: # cleanup() is called before nbmxpp.Client has disconnected, # when we disable the account. So we need to unregister ===================================== gajim/common/idle.py ===================================== @@ -28,6 +28,8 @@ from gi.repository import GLib from gi.repository import GObject +from gajim.common import app +from gajim.common.const import Display from gajim.common.const import IdleState log = logging.getLogger('gajim.c.idle') @@ -317,6 +319,9 @@ def _get_idle_monitor(): except GLib.Error as error: log.info('Idle time via D-Bus (GNOME) not available: %s', error) + if app.is_display(Display.WAYLAND): + return + try: return XssIdleMonitor() except OSError as error: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59315c3fef11755e53dde756b969993… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59315c3fef11755e53dde756b969993… 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