Commits May 2020

commits@gajim.org

1 participants
67 discussions

[Git][gajim/gajim][master] Gspell: Use default language if requested one is missing
by Philipp Hörist 25 May '20

25 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 12d9b099 by André Apitzsch at 2020-05-25T21:58:22+02:00 Gspell: Use default language if requested one is missing The default language cannot be `None` if `app.is_installed('GSPELL')` is `True`, because to be `True` at least one language needs to be available. If `app.is_installed('GSPELL')` is `False`, the modified code is not called. - - - - - 5 changed files: - gajim/chat_control_base.py - gajim/dialogs.py - gajim/gtk/dialogs.py - gajim/gtk/preferences.py - gajim/gtk/single_message.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -621,9 +621,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): return gspell_lang = self.get_speller_language() - if gspell_lang is None: - return - spell_checker = Gspell.Checker.new(gspell_lang) spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( self.msg_textview.get_buffer()) ===================================== gajim/dialogs.py ===================================== @@ -48,7 +48,6 @@ from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputDialog -from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder from gajim.gtk.util import get_activity_icon_name @@ -499,15 +498,14 @@ class ChangeStatusMessageDialog(TimeoutDialog): 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) + gspell_lang = Gspell.language_get_default() + 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: ===================================== gajim/gtk/dialogs.py ===================================== @@ -142,16 +142,6 @@ class HigDialog(Gtk.MessageDialog): self.show_all() -class AspellDictError: - def __init__(self, lang): - ErrorDialog( - _('Dictionary for language "%s" not available') % lang, - _('You have to install the dictionary "%s" to use spellchecking, ' - 'or choose another language by setting the speller_language ' - 'option.\n\n' - 'Highlighting misspelled words feature will not be used') % lang) - - class WarningDialog(HigDialog): """ HIG compliant warning dialog ===================================== gajim/gtk/preferences.py ===================================== @@ -44,7 +44,6 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_available_iconsets from gajim.gtk.util import open_window -from gajim.gtk.dialogs import AspellDictError from gajim.gtk.sounds import ManageSounds from gajim.gtk.const import ControlType from gajim.gtk import gstreamer @@ -638,13 +637,8 @@ class Preferences(Gtk.ApplicationWindow): gspell_lang = Gspell.language_lookup(lang) if gspell_lang is None: gspell_lang = Gspell.language_get_default() - if gspell_lang is None: - AspellDictError(lang) - app.config.set('use_speller', False) - widget.set_active(False) - else: - app.config.set('speller_language', gspell_lang.get_code()) - self.apply_speller() + app.config.set('speller_language', gspell_lang.get_code()) + self.apply_speller() def apply_speller(self): for ctrl in self._get_all_controls(): ===================================== gajim/gtk/single_message.py ===================================== @@ -27,7 +27,6 @@ from gajim.common.structs import OutgoingMessage from gajim.conversation_textview import ConversationTextview from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_completion_liststore @@ -86,15 +85,14 @@ class SingleMessageWindow(Gtk.ApplicationWindow): 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._ui.message_textview.get_buffer()) - spell_buffer.set_spell_checker(Gspell.Checker.new(gspell_lang)) - spell_view = Gspell.TextView.get_from_gtk_text_view( - self._ui.message_textview) - spell_view.set_inline_spell_checking(True) - spell_view.set_enable_language_menu(True) + gspell_lang = Gspell.language_get_default() + spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( + self._ui.message_textview.get_buffer()) + spell_buffer.set_spell_checker(Gspell.Checker.new(gspell_lang)) + spell_view = Gspell.TextView.get_from_gtk_text_view( + self._ui.message_textview) + spell_view.set_inline_spell_checking(True) + spell_view.set_enable_language_menu(True) self._prepare_widgets_for(self._action) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/12d9b099057ce56bd694eb8345c4e323… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/12d9b099057ce56bd694eb8345c4e323… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 5 commits: Logger: Add JID converter/adapter
by Philipp Hörist 23 May '20

23 May '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 3f6dabff by lovetox at 2020-05-23T12:37:59+02:00 Logger: Add JID converter/adapter - - - - - 6ef620a3 by lovetox at 2020-05-23T12:37:59+02:00 Fix codespell errors - - - - - 25b1b41f by lovetox at 2020-05-23T12:37:59+02:00 Update README.md - - - - - 68034d6a by lovetox at 2020-05-23T12:37:59+02:00 Depend on GLib >= 2.60.0 Fixes #10125 - - - - - 534a2947 by lovetox at 2020-05-23T12:37:59+02:00 Fix typo - - - - - 4 changed files: - README.md - gajim/common/logger.py - gajim/gajim.py - gajim/roster_window.py Changes: ===================================== README.md ===================================== @@ -12,7 +12,9 @@ - python3-css-parser - python3-keyring - python3-precis-i18n +- python3-packaging - gir1.2-soup-2.4 +- GLib > 2.60.0 ### Optional Runtime Requirements ===================================== gajim/common/logger.py ===================================== @@ -39,6 +39,7 @@ from collections import namedtuple from gi.repository import GLib from nbxmpp.protocol import Iq +from nbxmpp.protocol import JID from nbxmpp.structs import DiscoInfo from nbxmpp.structs import CommonError from nbxmpp.modules.discovery import parse_disco_info @@ -163,6 +164,16 @@ def _adapt_common_error(common_error): def _convert_marker(marker): return 'received' if marker == 0 else 'displayed' +def _jid_adapter(jid): + return str(jid) + +def _jid_converter(jid): + return JID(jid.decode()) + + +sqlite.register_converter('jid', _jid_converter) +sqlite.register_adapter(JID, _jid_adapter) + sqlite.register_converter('disco_info', _convert_disco_info) sqlite.register_adapter(DiscoInfo, _adapt_disco_info) @@ -1102,7 +1113,7 @@ class Logger: roster is the new version. """ # First we must reset roster_version value to ensure that the server - # sends back all the roster at the next connexion if the replacement + # sends back all the roster at the next connection if the replacement # didn't work properly. app.config.set_per('accounts', account_name, 'roster_version', '') ===================================== gajim/gajim.py ===================================== @@ -30,12 +30,13 @@ _MIN_NBXMPP_VER = '0.9.94' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' +_MIN_GLIB_VER = '2.60.0' def check_version(dep_name, current_ver, min_ver): if V(current_ver) < V(min_ver): - sys.exit('Gajim needs %s >= %s to run. ' - 'Quitting...' % (dep_name, min_ver)) + sys.exit('Gajim needs %s >= %s (found %s) to run. ' + 'Quitting...' % (dep_name, min_ver, current_ver)) def _check_required_deps(): @@ -71,11 +72,17 @@ def _check_required_deps(): Gtk.get_minor_version(), Gtk.get_micro_version()) + from gi.repository import GLib + glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, + GLib.MINOR_VERSION, + GLib.MICRO_VERSION])) + check_version('python-nbxmpp', nbxmpp.__version__, _MIN_NBXMPP_VER) check_version('pygobject', gi.__version__, _MIN_PYGOBJECT_VER) check_version('libcairo', cairo.cairo_version_string(), _MIN_CAIRO_VER) check_version('python-cairo', cairo.version, _MIN_CAIRO_VER) check_version('gtk3', gtk_ver, _MIN_GTK_VER) + check_version('glib', glib_ver, _MIN_GLIB_VER) def _init_gui(gui): ===================================== gajim/roster_window.py ===================================== @@ -5356,7 +5356,7 @@ class RosterWindow: self.starting_filtering = False # Number of renderers plugins added self.nb_ext_renderers = 0 - # When we quit, rememver if we already saved config once + # When we quit, remember if we already saved config once self.save_done = False # [icon, name, type, jid, account, editable, mood_pixbuf, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bb27f66aa25ebd9c4bec0a0e98f1db1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bb27f66aa25ebd9c4bec0a0e98f1db1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typo
by Philipp Hörist 23 May '20

23 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4e080ff1 by lovetox at 2020-05-23T09:21:05+02:00 Fix typo - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== @@ -30,7 +30,7 @@ _MIN_NBXMPP_VER = '0.9.94' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' -_MIN_GLIB_VER = '3.60.0' +_MIN_GLIB_VER = '2.60.0' def check_version(dep_name, current_ver, min_ver): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4e080ff16eed6840dcbdb3be5be317a3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4e080ff16eed6840dcbdb3be5be317a3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Depend on GLib >= 2.60.0
by Philipp Hörist 23 May '20

23 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7cbf2314 by lovetox at 2020-05-23T09:05:51+02:00 Depend on GLib >= 2.60.0 Fixes #10125 - - - - - 2 changed files: - README.md - gajim/gajim.py Changes: ===================================== README.md ===================================== @@ -14,6 +14,7 @@ - python3-precis-i18n - python3-packaging - gir1.2-soup-2.4 +- GLib > 2.60.0 ### Optional Runtime Requirements ===================================== gajim/gajim.py ===================================== @@ -30,12 +30,13 @@ _MIN_NBXMPP_VER = '0.9.94' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' +_MIN_GLIB_VER = '3.60.0' def check_version(dep_name, current_ver, min_ver): if V(current_ver) < V(min_ver): - sys.exit('Gajim needs %s >= %s to run. ' - 'Quitting...' % (dep_name, min_ver)) + sys.exit('Gajim needs %s >= %s (found %s) to run. ' + 'Quitting...' % (dep_name, min_ver, current_ver)) def _check_required_deps(): @@ -71,11 +72,17 @@ def _check_required_deps(): Gtk.get_minor_version(), Gtk.get_micro_version()) + from gi.repository import GLib + glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, + GLib.MINOR_VERSION, + GLib.MICRO_VERSION])) + check_version('python-nbxmpp', nbxmpp.__version__, _MIN_NBXMPP_VER) check_version('pygobject', gi.__version__, _MIN_PYGOBJECT_VER) check_version('libcairo', cairo.cairo_version_string(), _MIN_CAIRO_VER) check_version('python-cairo', cairo.version, _MIN_CAIRO_VER) check_version('gtk3', gtk_ver, _MIN_GTK_VER) + check_version('glib', glib_ver, _MIN_GLIB_VER) def _init_gui(gui): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7cbf23148bc8ab515d2d69ffc49340f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7cbf23148bc8ab515d2d69ffc49340f2… 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 22 May '20

22 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3fa94240 by lovetox at 2020-05-22T17:02:30+02:00 Update README.md - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -12,6 +12,7 @@ - python3-css-parser - python3-keyring - python3-precis-i18n +- python3-packaging - gir1.2-soup-2.4 ### Optional Runtime Requirements View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3fa942402a9d8b2e037d47ca1e5574ea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3fa942402a9d8b2e037d47ca1e5574ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix codespell errors
by Philipp Hörist 21 May '20

21 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7d953d61 by lovetox at 2020-05-21T22:39:13+02:00 Fix codespell errors - - - - - 2 changed files: - gajim/common/logger.py - gajim/roster_window.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -1113,7 +1113,7 @@ class Logger: roster is the new version. """ # First we must reset roster_version value to ensure that the server - # sends back all the roster at the next connexion if the replacement + # sends back all the roster at the next connection if the replacement # didn't work properly. app.config.set_per('accounts', account_name, 'roster_version', '') ===================================== gajim/roster_window.py ===================================== @@ -5356,7 +5356,7 @@ class RosterWindow: self.starting_filtering = False # Number of renderers plugins added self.nb_ext_renderers = 0 - # When we quit, rememver if we already saved config once + # When we quit, remember if we already saved config once self.save_done = False # [icon, name, type, jid, account, editable, mood_pixbuf, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7d953d6102149da733ac8e0c48e73c02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7d953d6102149da733ac8e0c48e73c02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Logger: Add JID converter/adapter
by Philipp Hörist 21 May '20

21 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: da6f5fc3 by lovetox at 2020-05-21T22:17:46+02:00 Logger: Add JID converter/adapter - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -39,6 +39,7 @@ from collections import namedtuple from gi.repository import GLib from nbxmpp.protocol import Iq +from nbxmpp.protocol import JID from nbxmpp.structs import DiscoInfo from nbxmpp.structs import CommonError from nbxmpp.modules.discovery import parse_disco_info @@ -163,6 +164,16 @@ def _adapt_common_error(common_error): def _convert_marker(marker): return 'received' if marker == 0 else 'displayed' +def _jid_adapter(jid): + return str(jid) + +def _jid_converter(jid): + return JID(jid.decode()) + + +sqlite.register_converter('jid', _jid_converter) +sqlite.register_adapter(JID, _jid_adapter) + sqlite.register_converter('disco_info', _convert_disco_info) sqlite.register_adapter(DiscoInfo, _adapt_disco_info) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da6f5fc3e35656cf260b9275e3dd7bc6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da6f5fc3e35656cf260b9275e3dd7bc6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 4 commits: Client: Unregister handlers on cleanup()
by Philipp Hörist 21 May '20

21 May '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: d08ebcc7 by lovetox at 2020-05-21T19:39:07+02:00 Client: Unregister handlers on cleanup() Fixes #10083 - - - - - 3b7a4947 by lovetox at 2020-05-21T19:39:07+02:00 Fix codespell errors - - - - - b29d2ae1 by lovetox at 2020-05-21T19:39:07+02:00 Make anonymous login work again - - - - - bb27f66a by lovetox at 2020-05-21T19:39:37+02:00 Windows: Add some plugins to the build - - - - - 5 changed files: - gajim/common/client.py - gajim/data/gui/account_wizard.ui - gajim/gtk/account_wizard.py - gajim/gui_interface.py - win/_base.sh Changes: ===================================== gajim/common/client.py ===================================== @@ -148,6 +148,11 @@ class Client(ConnectionHandlers): # his password self.password = passwords.get_password(self._account) + anonymous = app.config.get_per( + 'accounts', self._account, 'anonymous_auth') + if anonymous: + self._client.set_mechs(['ANONYMOUS']) + self._client.set_password(self.password) self._client.set_accepted_certificates( app.cert_store.get_certificates()) @@ -283,6 +288,7 @@ class Client(ConnectionHandlers): if self._destroy_client: self._client.destroy() + self._client = None self._destroy_client = False self._create_client() @@ -519,6 +525,7 @@ class Client(ConnectionHandlers): if self._destroy_client: self._client.destroy() + self._client = None self._destroy_client = False self._create_client() @@ -529,6 +536,13 @@ class Client(ConnectionHandlers): def cleanup(self): self._destroyed = True + if self._client is not None: + # cleanup() is called before nbmxpp.Client has disconnected, + # when we disable the account. So we need to unregister + # handlers here. + # TODO: cleanup() should not be called before disconnect is finished + for handler in modules.get_handlers(self): + self._client.unregister_handler(handler) modules.unregister_modules(self) def quit(self, kill_core): ===================================== gajim/data/gui/account_wizard.ui ===================================== @@ -701,7 +701,6 @@ Creating an account on one server allows you to communicate with contacts from o <object class="GtkCheckButton" id="sign_up_anonymously"> <property name="label" translatable="yes">Sign up Anonymously</property> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Note: Anonymous accounts are not possible on all servers</property> ===================================== gajim/gtk/account_wizard.py ===================================== @@ -136,17 +136,29 @@ class AccountWizard(Assistant): if self.get_page('signup').is_advanced(): self.show_page('advanced', Gtk.StackTransitionType.SLIDE_LEFT) + + elif self.get_page('signup').is_anonymous(): + self._test_anonymous_server() + else: self._register_with_server() elif page == 'advanced': - self._register_with_server() + if self.get_page('signup').is_anonymous(): + self._test_anonymous_server() + else: + self._register_with_server() elif page == 'security-warning': if self.get_page('security-warning').trust_certificate: app.cert_store.add_certificate( self.get_page('security-warning').cert) - self._register_with_server(ignore_all_errors=True) + + if self.get_page('signup').is_anonymous(): + self._test_anonymous_server(ignore_all_errors=True) + + else: + self._register_with_server(ignore_all_errors=True) elif page == 'form': self._show_progress_page(_('Creating Account...'), @@ -155,8 +167,6 @@ class AccountWizard(Assistant): elif button_name == 'connect': if page == 'success': - # if self.get_page('success').is_update(): - # app.interface.show_vcard_when_connect.append(self.account) app.interface.enable_account(self.get_page('success').account) self.destroy() @@ -279,6 +289,22 @@ class AccountWizard(Assistant): self._client.connect() + def _test_anonymous_server(self, ignore_all_errors=False): + self._show_progress_page(_('Connecting...'), + _('Connecting to server...')) + domain = self.get_page('signup').get_server() + advanced = self.get_page('signup').is_advanced() + + self._client = self._get_base_client( + domain, + None, + Mode.ANONYMOUS_TEST, + advanced, + ignore_all_errors) + + self._client.subscribe('anonymous-supported', self._on_anonymous_supported) + self._client.connect() + def _register_with_server(self, ignore_all_errors=False): self._show_progress_page(_('Connecting...'), _('Connecting to server...')) @@ -315,12 +341,33 @@ class AccountWizard(Assistant): client.get_module('Register').request_register_form( callback=self._on_register_form) + def _on_anonymous_supported(self, client, _signal_name): + account = self._generate_account_name(client.domain) + proxy_name = None + if client.proxy is not None: + proxy_name = self.get_page('advanced').get_proxy() + + app.interface.create_account(account, + None, + client.domain, + client.password, + proxy_name, + client.custom_host, + anonymous=True) + self.get_page('success').set_account(account) + self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) + def _on_disconnected(self, client, _signal_name): domain, error, text = client.get_error() if domain == StreamError.SASL: - self._show_error_page(_('Authentication failed'), - SASL_ERRORS.get(error), - text or '') + if error == 'anonymous-not-supported': + self._show_error_page(_('Anonymous login not supported'), + _('Anonymous login not supported'), + _('This server does not support anonymous')) + else: + self._show_error_page(_('Authentication failed'), + SASL_ERRORS.get(error), + text or '') elif domain == StreamError.BAD_CERTIFICATE: self.get_page('security-warning').set_warning( ===================================== gajim/gui_interface.py ===================================== @@ -1615,17 +1615,16 @@ class Interface: custom_host, anonymous=False): - if not account or not username or not domain: - log.error('Creating account failed: ' - 'account: %s, username: %s, domain: %s', - account, username, domain) - return + account_label = f'{username}@{domain}' + if anonymous: + username = 'anon' + account_label = f'anon@{domain}' config = {} config['active'] = False config['name'] = username config['resource'] = 'gajim.%s' % helpers.get_random_string(8) - config['account_label'] = '%s@%s' % (username, domain) + config['account_label'] = account_label config['account_color'] = get_color_for_account( '%s@%s' % (username, domain)) config['hostname'] = domain ===================================== win/_base.sh ===================================== @@ -148,6 +148,14 @@ function install_gajim { mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip + # Install preview plugin + curl -o "${BUILD_ROOT}"/url_image_preview.zip https://ftp.gajim.org/plugins_1.2_zip/url_image_preview.zip + 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/url_image_preview.zip + + # Install omemo plugin + curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins_1.2_zip/omemo.zip + 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/omemo.zip + # Install language dicts curl -o "${BUILD_ROOT}"/speller_dicts.zip https://gajim.org/downloads/snap/win/build/speller_dicts.zip 7z x -o"${MINGW_ROOT}"/share "${BUILD_ROOT}"/speller_dicts.zip View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c2c0828e55a2e48201e9032fcdd9c39… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c2c0828e55a2e48201e9032fcdd9c39… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Add some plugins to the build
by Philipp Hörist 21 May '20

21 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b7d77a39 by lovetox at 2020-05-21T19:11:24+02:00 Windows: Add some plugins to the build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -148,6 +148,14 @@ function install_gajim { mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip + # Install preview plugin + curl -o "${BUILD_ROOT}"/url_image_preview.zip https://ftp.gajim.org/plugins_master_zip/url_image_preview.zip + 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/url_image_preview.zip + + # Install omemo plugin + curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins_master_zip/omemo.zip + 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/omemo.zip + # Install language dicts curl -o "${BUILD_ROOT}"/speller_dicts.zip https://gajim.org/downloads/snap/win/build/speller_dicts.zip 7z x -o"${MINGW_ROOT}"/share "${BUILD_ROOT}"/speller_dicts.zip View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7d77a39835c2f4499a865c65c29c78a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7d77a39835c2f4499a865c65c29c78a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make anonymous login work again
by Philipp Hörist 21 May '20

21 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 86c18b88 by lovetox at 2020-05-21T17:58:48+02:00 Make anonymous login work again - - - - - 4 changed files: - gajim/common/client.py - gajim/data/gui/account_wizard.ui - gajim/gtk/account_wizard.py - gajim/gui_interface.py Changes: ===================================== gajim/common/client.py ===================================== @@ -148,6 +148,11 @@ class Client(ConnectionHandlers): # his password self.password = passwords.get_password(self._account) + anonymous = app.config.get_per( + 'accounts', self._account, 'anonymous_auth') + if anonymous: + self._client.set_mechs(['ANONYMOUS']) + self._client.set_password(self.password) self._client.set_accepted_certificates( app.cert_store.get_certificates()) ===================================== gajim/data/gui/account_wizard.ui ===================================== @@ -701,7 +701,6 @@ Creating an account on one server allows you to communicate with contacts from o <object class="GtkCheckButton" id="sign_up_anonymously"> <property name="label" translatable="yes">Sign up Anonymously</property> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Note: Anonymous accounts are not possible on all servers</property> ===================================== gajim/gtk/account_wizard.py ===================================== @@ -136,17 +136,29 @@ class AccountWizard(Assistant): if self.get_page('signup').is_advanced(): self.show_page('advanced', Gtk.StackTransitionType.SLIDE_LEFT) + + elif self.get_page('signup').is_anonymous(): + self._test_anonymous_server() + else: self._register_with_server() elif page == 'advanced': - self._register_with_server() + if self.get_page('signup').is_anonymous(): + self._test_anonymous_server() + else: + self._register_with_server() elif page == 'security-warning': if self.get_page('security-warning').trust_certificate: app.cert_store.add_certificate( self.get_page('security-warning').cert) - self._register_with_server(ignore_all_errors=True) + + if self.get_page('signup').is_anonymous(): + self._test_anonymous_server(ignore_all_errors=True) + + else: + self._register_with_server(ignore_all_errors=True) elif page == 'form': self._show_progress_page(_('Creating Account...'), @@ -155,8 +167,6 @@ class AccountWizard(Assistant): elif button_name == 'connect': if page == 'success': - # if self.get_page('success').is_update(): - # app.interface.show_vcard_when_connect.append(self.account) app.interface.enable_account(self.get_page('success').account) self.destroy() @@ -279,6 +289,22 @@ class AccountWizard(Assistant): self._client.connect() + def _test_anonymous_server(self, ignore_all_errors=False): + self._show_progress_page(_('Connecting...'), + _('Connecting to server...')) + domain = self.get_page('signup').get_server() + advanced = self.get_page('signup').is_advanced() + + self._client = self._get_base_client( + domain, + None, + Mode.ANONYMOUS_TEST, + advanced, + ignore_all_errors) + + self._client.subscribe('anonymous-supported', self._on_anonymous_supported) + self._client.connect() + def _register_with_server(self, ignore_all_errors=False): self._show_progress_page(_('Connecting...'), _('Connecting to server...')) @@ -315,12 +341,33 @@ class AccountWizard(Assistant): client.get_module('Register').request_register_form( callback=self._on_register_form) + def _on_anonymous_supported(self, client, _signal_name): + account = self._generate_account_name(client.domain) + proxy_name = None + if client.proxy is not None: + proxy_name = self.get_page('advanced').get_proxy() + + app.interface.create_account(account, + None, + client.domain, + client.password, + proxy_name, + client.custom_host, + anonymous=True) + self.get_page('success').set_account(account) + self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) + def _on_disconnected(self, client, _signal_name): domain, error, text = client.get_error() if domain == StreamError.SASL: - self._show_error_page(_('Authentication failed'), - SASL_ERRORS.get(error), - text or '') + if error == 'anonymous-not-supported': + self._show_error_page(_('Anonymous login not supported'), + _('Anonymous login not supported'), + _('This server does not support anonymous')) + else: + self._show_error_page(_('Authentication failed'), + SASL_ERRORS.get(error), + text or '') elif domain == StreamError.BAD_CERTIFICATE: self.get_page('security-warning').set_warning( ===================================== gajim/gui_interface.py ===================================== @@ -1615,17 +1615,16 @@ class Interface: custom_host, anonymous=False): - if not account or not username or not domain: - log.error('Creating account failed: ' - 'account: %s, username: %s, domain: %s', - account, username, domain) - return + account_label = f'{username}@{domain}' + if anonymous: + username = 'anon' + account_label = f'anon@{domain}' config = {} config['active'] = False config['name'] = username config['resource'] = 'gajim.%s' % helpers.get_random_string(8) - config['account_label'] = '%s@%s' % (username, domain) + config['account_label'] = account_label config['account_color'] = get_color_for_account( '%s@%s' % (username, domain)) config['hostname'] = domain View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86c18b885b7b05543510864988695604… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86c18b885b7b05543510864988695604… 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