Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Disable resizing in GroupchatInvitationReceived
by Philipp Hörist 19 Apr '19

19 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 24352b57 by Daniel Brötzmann at 2019-04-19T14:58:47Z Disable resizing in GroupchatInvitationReceived - - - - - 2 changed files: - gajim/data/gui/groupchat_invitation_received.ui - gajim/gtk/dialogs.py Changes: ===================================== gajim/data/gui/groupchat_invitation_received.ui ===================================== @@ -15,7 +15,7 @@ <property name="label"><b>contact/jid</b> has invited you to the group chat <b>muc.jid</b></property> <property name="use_markup">True</property> <property name="wrap">True</property> - <property name="max_width_chars">70</property> + <property name="max_width_chars">50</property> <property name="xalign">0</property> </object> <packing> @@ -138,7 +138,7 @@ <property name="no_show_all">True</property> <property name="label"><comment></property> <property name="wrap">True</property> - <property name="max_width_chars">70</property> + <property name="max_width_chars">50</property> <property name="xalign">0</property> </object> <packing> ===================================== gajim/gtk/dialogs.py ===================================== @@ -1006,6 +1006,7 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): self.set_name('InvitationReceivedDialog') self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) + self.set_resizable(False) self.set_show_menubar(False) self.set_title(_('Group Chat Invitation ')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/24352b57c7bff92a3c570d3216564b1ecf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/24352b57c7bff92a3c570d3216564b1ecf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Improve module imports
by Philipp Hörist 19 Apr '19

19 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 731aaab6 by Philipp Hörist at 2019-04-19T14:57:12Z Improve module imports Import modules only on demand instead all on first module import - - - - - b2b249c6 by Philipp Hörist at 2019-04-19T14:57:12Z Refator DataFormDialog - - - - - 7 changed files: - gajim/common/connection.py - gajim/common/modules/__init__.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/dialogs.py - gajim/gtk/dataform.py - gajim/gtk/pep_config.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -492,7 +492,7 @@ class Connection(CommonConnection, ConnectionHandlers): self._sm_resume_data = {} # Register all modules - modules.register(self) + modules.register_modules(self) app.ged.register_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) @@ -505,7 +505,7 @@ class Connection(CommonConnection, ConnectionHandlers): # END __init__ def cleanup(self): - modules.unregister(self) + modules.unregister_modules(self) app.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) app.ged.remove_event_handler('gc-message-outgoing', ged.OUT_CORE, ===================================== gajim/common/modules/__init__.py ===================================== @@ -17,9 +17,9 @@ from typing import Dict # pylint: disable=unused-import from typing import List from typing import Tuple +import sys import logging from importlib import import_module -from pathlib import Path from unittest.mock import MagicMock from gajim.common.types import ConnectionT @@ -32,6 +32,49 @@ ZEROCONF_MODULES = ['iq', 'discovery', 'chatstates'] +MODULES = [ + 'adhoc_commands', + 'annotations', + 'bits_of_binary', + 'blocking', + 'bookmarks', + 'caps', + 'carbons', + 'chatstates', + 'delimiter', + 'discovery', + 'entity_time', + 'gateway', + 'httpupload', + 'http_auth', + 'iq', + 'last_activity', + 'mam', + 'message', + 'metacontacts', + 'muc', + 'pep', + 'ping', + 'presence', + 'privacylists', + 'pubsub', + 'receipts', + 'register', + 'roster', + 'roster_item_exchange', + 'search', + 'security_labels', + 'software_version', + 'user_activity', + 'user_avatar', + 'user_location', + 'user_mood', + 'user_nickname', + 'user_tune', + 'vcard_avatars', + 'vcard_temp', +] + _imported_modules = [] # type: List[tuple] _modules = {} # type: Dict[str, Dict[str, Any]] _store_publish_modules = [ @@ -41,20 +84,6 @@ _store_publish_modules = [ 'UserTune', ] # type: List[str] -for file in Path(__file__).parent.iterdir(): - if file.stem == '__init__': - continue - - _module = import_module('.%s' % file.stem, package='gajim.common.modules') - if hasattr(_module, 'get_instance'): - log.info('Load module: %s', file.stem) - if file.stem == 'pep': - # Register the PEP module first, because other modules - # depend on it - _imported_modules.insert(0, (_module, file.stem)) - else: - _imported_modules.append((_module, file.stem)) - class ModuleMock: def __init__(self, name: str) -> None: @@ -84,33 +113,32 @@ class ModuleMock: return MagicMock() -def register(con: ConnectionT, *args: Any, **kwargs: Any) -> None: +def register_modules(con: ConnectionT, *args: Any, **kwargs: Any) -> None: if con in _modules: return _modules[con.name] = {} - for module in _imported_modules: - mod, name = module + for module_name in MODULES: if con.name == 'Local': - if name not in ZEROCONF_MODULES: + if module_name not in ZEROCONF_MODULES: continue - instance, name = mod.get_instance(con, *args, **kwargs) + instance, name = _load_module(module_name, con, *args, **kwargs) _modules[con.name][name] = instance -def register_single(con: ConnectionT, instance: Any, name: str) -> None: +def register_single_module(con: ConnectionT, instance: Any, name: str) -> None: if con.name not in _modules: raise ValueError('Unknown account name: %s' % con.name) _modules[con.name][name] = instance -def unregister(con: ConnectionT) -> None: +def unregister_modules(con: ConnectionT) -> None: for instance in _modules[con.name].values(): if hasattr(instance, 'cleanup'): instance.cleanup() del _modules[con.name] -def unregister_single(con: ConnectionT, name: str) -> None: +def unregister_single_module(con: ConnectionT, name: str) -> None: if con.name not in _modules: return if name not in _modules[con.name]: @@ -130,6 +158,15 @@ def get(account: str, name: str) -> Any: return ModuleMock(name) +def _load_module(name: str, con: ConnectionT, *args: Any, **kwargs: Any) -> Any: + if name not in MODULES: + raise ValueError('Module %s does not exist' % name) + module = sys.modules.get(name) + if module is None: + module = import_module('.%s' % name, package='gajim.common.modules') + return module.get_instance(con, *args, **kwargs) # type: ignore + + def get_handlers(con: ConnectionT) -> List[Tuple[Any, ...]]: handlers = [] # type: List[Tuple[Any, ...]] for module in _modules[con.name].values(): ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -70,7 +70,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): self.is_zeroconf = True # Register all modules - modules.register(self) + modules.register_modules(self) app.ged.register_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) ===================================== gajim/dialogs.py ===================================== @@ -38,8 +38,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib -from gajim import dataforms_widget - from gajim.common import ged from gajim.common.i18n import _ from gajim.common.const import ACTIVITIES @@ -48,7 +46,6 @@ from gajim.common.const import MOODS from gajim.common import app from gajim.common import helpers from gajim.common import i18n -from gajim.common.modules import dataforms from gajim.common.exceptions import GajimGeneralException from gajim.gtk.dialogs import ErrorDialog @@ -57,7 +54,6 @@ from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_icon_name -from gajim.gtk.util import resize_window from gajim.gtk.util import get_builder from gajim.gtk.util import get_activity_icon_name @@ -1355,30 +1351,6 @@ class Dialog(Gtk.Dialog): self.destroy() -class DataFormWindow(Dialog): - def __init__(self, form, on_response_ok): - self.df_response_ok = on_response_ok - Dialog.__init__(self, None, 'test', [(Gtk.STOCK_CANCEL, - Gtk.ResponseType.CANCEL), (Gtk.STOCK_OK, Gtk.ResponseType.OK)], - on_response_ok=self.on_ok) - self.set_resizable(True) - resize_window(self, 600, 400) - self.dataform_widget = dataforms_widget.DataFormWidget() - self.dataform = dataforms.extend_form(node=form) - self.dataform_widget.set_sensitive(True) - self.dataform_widget.data_form = self.dataform - self.dataform_widget.show_all() - self.get_content_area().pack_start(self.dataform_widget, True, True, 0) - - def on_ok(self): - form = self.dataform_widget.data_form - if isinstance(self.df_response_ok, tuple): - self.df_response_ok[0](form, *self.df_response_ok[1:]) - else: - self.df_response_ok(form) - self.destroy() - - class ResourceConflictDialog(TimeoutDialog, InputDialog): def __init__(self, title, text, resource, ok_handler): TimeoutDialog.__init__(self, 15) ===================================== gajim/gtk/dataform.py ===================================== @@ -21,6 +21,7 @@ from gajim.gtkgui_helpers import scale_pixbuf_from_data from gajim.common import app from gajim.common.i18n import _ +from gajim.common.modules.dataforms import extend_form from gajim.gtk.util import MultiLineLabel @@ -551,3 +552,33 @@ class ImageMediaField(): def add(self, form_grid, row_number): form_grid.attach(self._image, 1, row_number, 1, 1) + + +class DataFormDialog(Gtk.Dialog): + def __init__(self, title, transient_for, form, node, submit_callback): + Gtk.Dialog.__init__(self, + title=title, + transient_for=transient_for, + modal=False) + self.set_default_size(600, 500) + + self._submit_callback = submit_callback + self._form = DataFormWidget(extend_form(node=form)) + self._node = node + + self.get_content_area().get_style_context().add_class('dialog-margin') + self.get_content_area().add(self._form) + + self.add_button(_('Cancel'), Gtk.ResponseType.CANCEL) + + submit_button = self.add_button(_('Submit'), Gtk.ResponseType.OK) + submit_button.get_style_context().add_class('suggested-action') + self.set_default_response(Gtk.ResponseType.OK) + + self.connect('response', self._on_response) + self.show_all() + + def _on_response(self, _dialog, response): + if response == Gtk.ResponseType.OK: + self._submit_callback(self._form.get_submit_form(), self._node) + self.destroy() ===================================== gajim/gtk/pep_config.py ===================================== @@ -20,6 +20,7 @@ from gajim.common.i18n import _ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog +from gajim.gtk.dataform import DataFormDialog from gajim.gtk.util import get_builder @@ -122,14 +123,14 @@ class ManagePEPServicesWindow: con = app.connections[self.account] con.get_module('PubSub').request_pb_configuration(our_jid, node) + def _on_config_submit(self, form, node): + our_jid = app.get_jid_from_account(self.account) + con = app.connections[self.account] + con.get_module('PubSub').send_pb_configure(our_jid, node, form) + def _nec_pep_config_received(self, obj): - def on_ok(form, node): - form.type_ = 'submit' - our_jid = app.get_jid_from_account(self.account) - con = app.connections[self.account] - con.get_module('PubSub').send_pb_configure(our_jid, node, form) - from gajim.dialogs import DataFormWindow - window = DataFormWindow(obj.form, (on_ok, obj.node)) - title = _('Configure %s') % obj.node - window.set_title(title) - window.show_all() + DataFormDialog(_('Configure %s') % obj.node, + self.window, + obj.form, + obj.node, + self._on_config_submit) ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -408,7 +408,7 @@ class PluginManager(metaclass=Singleton): if not module.zeroconf and con.name == 'Local': continue instance, name = module.get_instance(con) - modules.register_single(con, instance, name) + modules.register_single_module(con, instance, name) # If handlers have been registered, register the # plugin handlers. Otherwise this will be done @@ -424,7 +424,7 @@ class PluginManager(metaclass=Singleton): for con in app.connections.values(): for module in plugin.modules: instance = con.get_module(module.name) - modules.unregister_single(con, module.name) + modules.unregister_single_module(con, module.name) # Account is still connected and handlers are registered # So just unregister the plugin handlers @@ -562,7 +562,7 @@ class PluginManager(metaclass=Singleton): instance, name = module.get_instance(con) if not module.zeroconf and con.name == 'Local': continue - modules.register_single(con, instance, name) + modules.register_single_module(con, instance, name) def _plugin_is_active_in_global_config(self, plugin): return app.config.get_per('plugins', plugin.short_name, 'active') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e999b74a5bcaee81078b222a72b768944… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e999b74a5bcaee81078b222a72b768944… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] zeroconf_bonjour: switch from DNSServiceQueryRecord to DNSServiceGetAddrInfo for IPv6 compatibility
by Philipp Hörist 17 Apr '19

17 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e999b74a by Sebastiaan Lokhorst at 2019-04-17T17:26:28Z zeroconf_bonjour: switch from DNSServiceQueryRecord to DNSServiceGetAddrInfo for IPv6 compatibility - - - - - 1 changed file: - gajim/common/zeroconf/zeroconf_bonjour.py Changes: ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== @@ -17,7 +17,6 @@ import logging import select -import socket import re from gajim.common.i18n import _ @@ -157,16 +156,16 @@ class Zeroconf: self.queried.append(True) - def query_record_callback(self, sdRef, flags, interfaceIndex, errorCode, - hosttarget, rrtype, rrclass, rdata, ttl): + def getaddrinfo_callback(self, sdRef, flags, interfaceIndex, errorCode, + hosttarget, address, ttl): if errorCode != pybonjour.kDNSServiceErr_NoError: - log.error('Error in query_record_callback: %s', str(errorCode)) + log.error('Error in getaddrinfo_callback: %s', str(errorCode)) return fullname, port, txtRecord = self.resolved_contacts[hosttarget] txt = pybonjour.TXTRecord.parse(txtRecord) - ip = socket.inet_ntoa(rdata) + ip = address[1] name, bare_name, protocol, domain = self._parse_name(fullname) @@ -207,20 +206,18 @@ class Zeroconf: self.resolved_contacts[hosttarget] = (fullname, port, txtRecord) try: - query_sdRef = None - query_sdRef = \ - pybonjour.DNSServiceQueryRecord( + getaddrinfo_sdRef = \ + pybonjour.DNSServiceGetAddrInfo( interfaceIndex=interfaceIndex, - fullname=hosttarget, - rrtype=pybonjour.kDNSServiceType_A, - callBack=self.query_record_callback) + hostname=hosttarget, + callBack=self.getaddrinfo_callback) while not self.queried: - ready = select.select([query_sdRef], [], [], resolve_timeout) - if query_sdRef not in ready[0]: - log.warning('Query record timed out') + ready = select.select([getaddrinfo_sdRef], [], [], resolve_timeout) + if getaddrinfo_sdRef not in ready[0]: + log.warning('GetAddrInfo timed out') break - pybonjour.DNSServiceProcessResult(query_sdRef) + pybonjour.DNSServiceProcessResult(getaddrinfo_sdRef) else: self.queried.pop() @@ -231,8 +228,8 @@ class Zeroconf: self.error_CB(_('Error while adding service. %s') % error) finally: - if query_sdRef: - query_sdRef.close() + if getaddrinfo_sdRef: + getaddrinfo_sdRef.close() self.resolved.append(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e999b74a5bcaee81078b222a72b7689440… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e999b74a5bcaee81078b222a72b7689440… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update README.md
by Philipp Hörist 16 Apr '19

16 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8f360401 by Philipp Hörist at 2019-04-16T21:34:04Z Update README.md - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -16,7 +16,7 @@ ### Optional Runtime Requirements - python3-pil (pillow) for support of webp avatars -- For zeroconf you need python3-dbus on Linux or [pybonjour](https://dev.gajim.org/lovetox/pybonjour-python3) on Windows/macOS +- gir1.2-avahi-0.6 for zeroconf on Linux or [pybonjour](https://dev.gajim.org/lovetox/pybonjour-python3) on Windows/macOS - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working @@ -35,7 +35,7 @@ #### Packages - [Arch](https://aur.archlinux.org/packages/gajim-git/) -- [Debian](https://packages.debian.org/source/experimental/gajim) (tested with Debian ``testing`` and ``unstable``) +- [Debian](https://packages.debian.org/stretch-backports/gajim) #### Snapshots View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8f3604016f4909f3b3a27ba4c33fe86cdc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8f3604016f4909f3b3a27ba4c33fe86cdc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update README.md
by Philipp Hörist 16 Apr '19

16 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: df71c623 by Philipp Hörist at 2019-04-16T21:30:00Z Update README.md - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -16,7 +16,6 @@ ### Optional Runtime Requirements - python3-pil (pillow) for support of webp avatars -- python3-gnupg to enable GPG encryption - For zeroconf you need python3-dbus on Linux or [pybonjour](https://dev.gajim.org/lovetox/pybonjour-python3) on Windows/macOS - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/df71c623e080ef97825d85862abc183a36… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/df71c623e080ef97825d85862abc183a36… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Implementing error type=modify handling for XEP-0077
by Philipp Hörist 16 Apr '19

16 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 64bac1d9 by Alexander Bogdanov at 2019-04-16T16:47:39Z Implementing error type=modify handling for XEP-0077 - - - - - 2 changed files: - gajim/common/modules/register.py - gajim/gtk/service_registration.py Changes: ===================================== gajim/common/modules/register.py ===================================== @@ -87,7 +87,10 @@ class Register(BaseModule): error = stanza.getErrorMsg() self._log.info('Error: %s', error) if error_cb() is not None: - error_cb()(error) + form = is_form = None + if stanza.getErrorType() == 'modify': + form, is_form = self._get_register_form(stanza) + error_cb()(error, form, is_form) return self._con.get_module('Presence').subscribe(agent, auto_auth=True) @@ -119,19 +122,25 @@ class Register(BaseModule): error_cb()(error) else: self._log.info('Register form received') - parse_bob_data(stanza.getQuery()) - form = stanza.getQuery().getTag('x', namespace=nbxmpp.NS_DATA) - is_form = form is not None - if not is_form: - form = {} - for field in stanza.getQueryPayload(): - if not isinstance(field, nbxmpp.Node): - continue - form[field.getName()] = field.getData() if success_cb() is not None: + form, is_form = self._get_register_form(stanza) success_cb()(form, is_form) + @staticmethod + def _get_register_form(stanza): + parse_bob_data(stanza.getQuery()) + form = stanza.getQuery().getTag('x', namespace=nbxmpp.NS_DATA) + is_form = form is not None + if not is_form: + form = {} + for field in stanza.getQueryPayload(): + if not isinstance(field, nbxmpp.Node): + continue + form[field.getName()] = field.getData() + + return form, is_form + def get_instance(*args, **kwargs): return Register(*args, **kwargs), 'Register' ===================================== gajim/gtk/service_registration.py ===================================== @@ -75,6 +75,18 @@ class ServiceRegistration(Gtk.Assistant): sidebar = main_box.get_children()[0] main_box.remove(sidebar) + def _build_dataform(self, form, is_form): + if not is_form: + from gajim import config + return config.FakeDataForm(form) + + dataform = dataforms.extend_form(node=form) + + form_widget = DataFormWidget(dataform) + form_widget.connect('is-valid', self._on_is_valid) + form_widget.validate() + return form_widget + def _on_page_change(self, assistant, page): if self.get_current_page() == Page.REQUEST: self._con.get_module('Register').get_register_form( @@ -86,28 +98,24 @@ class ServiceRegistration(Gtk.Assistant): def _on_get_success(self, form, is_form): log.info('Show Form page') self._is_form = is_form - if is_form: - dataform = dataforms.extend_form(node=form) - self._data_form_widget = DataFormWidget(dataform) - self._data_form_widget.connect('is-valid', self._on_is_valid) - self._data_form_widget.validate() - else: - from gajim import config - self._data_form_widget = config.FakeDataForm(form) - - page = self.get_nth_page(Page.FORM) - page.pack_start(self._data_form_widget, True, True, 0) - self._data_form_widget.show_all() + self._data_form_widget = self._build_dataform(form, is_form) + self.get_nth_page(Page.FORM).set_form(self._data_form_widget) self.set_current_page(Page.FORM) def _on_is_valid(self, _widget, is_valid): self.set_page_complete(self.get_nth_page(Page.FORM), is_valid) - def _on_error(self, error_text): - log.info('Show Error page') - page = self.get_nth_page(Page.ERROR) - page.set_text(error_text) - self.set_current_page(Page.ERROR) + def _on_error(self, error_text, form=None, is_form=False): + if form is not None: + log.info('Show Form page') + self._is_form = is_form + self._data_form_widget = self._build_dataform(form, is_form) + self.get_nth_page(Page.FORM).set_form(self._data_form_widget, error_text=error_text) + self.set_current_page(Page.FORM) + else: + log.info('Show Error page') + self.get_nth_page(Page.ERROR).set_text(error_text) + self.set_current_page(Page.ERROR) def _on_cancel(self, widget): self.destroy() @@ -164,6 +172,25 @@ class FormPage(Gtk.Box): def __init__(self): super().__init__(orientation=Gtk.Orientation.VERTICAL) + self._form = None + self._label = Gtk.Label() + self._label.set_no_show_all(True) + self._label.get_style_context().add_class('error-color') + self.pack_end(self._label, False, False, 0) + + def set_form(self, form, error_text=None): + if self._form is not None: + self.remove(self._form) + self._form.destroy() + self._label.hide() + self._form = form + + if error_text is not None: + self._label.set_text(error_text) + self._label.show() + + self.pack_start(form, True, True, 0) + self._form.show_all() class SuccessfulPage(Gtk.Box): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/64bac1d9105b056d83b4f336636fac656f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/64bac1d9105b056d83b4f336636fac656f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Implementing error type=modify handling for XEP-0077
by Philipp Hörist 16 Apr '19

16 Apr '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: ff9afe19 by Alexander Bogdanov at 2019-04-16T16:33:32Z Implementing error type=modify handling for XEP-0077 - - - - - 2 changed files: - gajim/common/modules/register.py - gajim/gtk/service_registration.py Changes: ===================================== gajim/common/modules/register.py ===================================== @@ -92,7 +92,10 @@ class Register: error = stanza.getErrorMsg() log.info('Error: %s', error) if error_cb() is not None: - error_cb()(error) + form = is_form = None + if stanza.getTagAttr('error', 'type') == 'modify': + form, is_form = self._get_register_form(stanza) + error_cb()(error, form, is_form) return self._con.get_module('Presence').subscribe(agent, auto_auth=True) @@ -116,8 +119,7 @@ class Register: iq, self._register_info_response, {'success_cb': weak_success_cb, 'error_cb': weak_error_cb}) - @staticmethod - def _register_info_response(_con, stanza, success_cb, error_cb): + def _register_info_response(self, _con, stanza, success_cb, error_cb): if not nbxmpp.isResultNode(stanza): error = stanza.getErrorMsg() log.info('Error: %s', error) @@ -125,18 +127,28 @@ class Register: error_cb()(error) else: log.info('Register form received') - form = stanza.getQuery().getTag('x', namespace=nbxmpp.NS_DATA) - is_form = form is not None - if not is_form: - form = {} - for field in stanza.getQueryPayload(): - if not isinstance(field, nbxmpp.Node): - continue - form[field.getName()] = field.getData() if success_cb() is not None: + form, is_form = self._get_register_form(stanza) success_cb()(form, is_form) + @staticmethod + def _get_register_form(stanza): + query = stanza.getTag('query') + if not query: + return None, False + + form = query.getTag('x', namespace=nbxmpp.NS_DATA) + is_form = form is not None + if not is_form: + form = {} + for field in query.getPayload(): + if not isinstance(field, nbxmpp.Node): + continue + form[field.getName()] = field.getData() + + return form, is_form + def get_instance(*args, **kwargs): return Register(*args, **kwargs), 'Register' ===================================== gajim/gtk/service_registration.py ===================================== @@ -75,6 +75,14 @@ class ServiceRegistration(Gtk.Assistant): sidebar = main_box.get_children()[0] main_box.remove(sidebar) + def _build_dataform(self, form, is_form): + if not is_form: + from gajim import config + return config.FakeDataForm(form) + + dataform = dataforms.extend_form(node=form) + return DataFormWidget(dataform) + def _on_page_change(self, assistant, page): if self.get_current_page() == Page.REQUEST: self._con.get_module('Register').get_register_form( @@ -86,23 +94,22 @@ class ServiceRegistration(Gtk.Assistant): def _on_get_success(self, form, is_form): log.info('Show Form page') self._is_form = is_form - if is_form: - dataform = dataforms.extend_form(node=form) - self._data_form_widget = DataFormWidget(dataform) - else: - from gajim import config - self._data_form_widget = config.FakeDataForm(form) + self._data_form_widget = self._build_dataform(form, is_form) - page = self.get_nth_page(Page.FORM) - page.pack_start(self._data_form_widget, True, True, 0) - self._data_form_widget.show_all() + self.get_nth_page(Page.FORM).set_form(self._data_form_widget) self.set_current_page(Page.FORM) - def _on_error(self, error_text): - log.info('Show Error page') - page = self.get_nth_page(Page.ERROR) - page.set_text(error_text) - self.set_current_page(Page.ERROR) + def _on_error(self, error_text, form=None, is_form=False): + if form is not None: + log.info('Show Form page') + self._is_form = is_form + self._data_form_widget = self._build_dataform(form, is_form) + self.get_nth_page(Page.FORM).set_form(self._data_form_widget, error_text=error_text) + self.set_current_page(Page.FORM) + else: + log.info('Show Error page') + self.get_nth_page(Page.ERROR).set_text(error_text) + self.set_current_page(Page.ERROR) def _on_cancel(self, widget): self.destroy() @@ -159,6 +166,25 @@ class FormPage(Gtk.Box): def __init__(self): super().__init__(orientation=Gtk.Orientation.VERTICAL) + self._form = None + self._label = Gtk.Label() + self._label.set_no_show_all(True) + self._label.get_style_context().add_class('error-color') + self.pack_end(self._label, False, False, 0) + + def set_form(self, form, error_text=None): + if self._form is not None: + self.remove(self._form) + self._form.destroy() + self._label.hide() + self._form = form + + if error_text is not None: + self._label.set_text(error_text) + self._label.show() + + self.pack_start(form, True, True, 0) + self._form.show_all() class SuccessfulPage(Gtk.Box): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff9afe194eea8a554131ee676200fc7c63… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff9afe194eea8a554131ee676200fc7c63… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add speller to ChangeStatus dialog
by Philipp Hörist 15 Apr '19

15 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2f9b716a by Daniel Brötzmann at 2019-04-15T16:23:55Z Add speller to ChangeStatus dialog - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== @@ -55,11 +55,15 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import InformationDialog +from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import get_builder from gajim.gtk.util import get_activity_icon_name +if app.is_installed('GSPELL'): + from gi.repository import Gspell # pylint: disable=ungrouped-imports + log = logging.getLogger('gajim.dialogs') @@ -624,6 +628,21 @@ class ChangeStatusMessageDialog(TimeoutDialog): message_textview = self.xml.get_object('message_textview') self.message_buffer = message_textview.get_buffer() + + if app.config.get('use_speller') and app.is_installed('GSPELL'): + lang = app.config.get('speller_language') + gspell_lang = Gspell.language_lookup(lang) + if gspell_lang is None: + AspellDictError(lang) + else: + spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( + self.message_buffer) + spell_buffer.set_spell_checker(Gspell.Checker.new(gspell_lang)) + spell_view = Gspell.TextView.get_from_gtk_text_view( + message_textview) + spell_view.set_inline_spell_checking(True) + spell_view.set_enable_language_menu(True) + self.message_buffer.connect('changed', self.on_message_buffer_changed) if not msg: msg = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2f9b716ab0e18a356690d446c510ca5e3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2f9b716ab0e18a356690d446c510ca5e3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Switch encrypted symbol to symbolic
by Philipp Hörist 15 Apr '19

15 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ef1d7771 by Daniel Brötzmann at 2019-04-15T09:14:49Z ChatControl: Switch encrypted symbol to symbolic - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -825,13 +825,14 @@ class ChatControl(ChatControlBase): if authenticated: authenticated_string = _('and authenticated') self.lock_image.set_from_icon_name( - 'security-high', Gtk.IconSize.MENU) + 'security-high-symbolic', Gtk.IconSize.MENU) else: authenticated_string = _('and NOT authenticated') self.lock_image.set_from_icon_name( - 'security-low', Gtk.IconSize.MENU) + 'security-low-symbolic', Gtk.IconSize.MENU) - tooltip = _('%(type)s encryption is active %(authenticated)s.') % {'type': enc_type, 'authenticated': authenticated_string} + tooltip = _('%(type)s encryption is active %(authenticated)s') % \ + {'type': enc_type, 'authenticated': authenticated_string} self.authentication_button.set_tooltip_text(tooltip) self.widget_set_visible(self.authentication_button, not visible) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ef1d7771fb60aa197b50c7d7e39c907688… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ef1d7771fb60aa197b50c7d7e39c907688… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add delay execution decorator
by Philipp Hörist 14 Apr '19

14 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 53880edd by Philipp Hörist at 2019-04-14T20:32:47Z Add delay execution decorator - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -50,9 +50,11 @@ from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode from string import Template +from functools import wraps import nbxmpp from nbxmpp.stringprepare import nameprep +from gi.repository import GLib import precis_i18n.codec # pylint: disable=unused-import from gajim.common import app @@ -1532,3 +1534,21 @@ class Singleton(type): cls._instances[cls] = super(Singleton, cls).__call__( *args, **kwargs) return cls._instances[cls] + + +def delay_execution(milliseconds): + # Delay the first call for `milliseconds` + # ignore all other calls while the delay is active + def delay_execution_decorator(func): + @wraps(func) + def func_wrapper(*args, **kwargs): + def timeout_wrapper(): + func(*args, **kwargs) + delattr(func_wrapper, 'source_id') + + if hasattr(func_wrapper, 'source_id'): + return + func_wrapper.source_id = GLib.timeout_add( + milliseconds, timeout_wrapper) + return func_wrapper + return delay_execution_decorator View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/53880edd96f270f42562b92b64c21a3fd2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/53880edd96f270f42562b92b64c21a3fd2… 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