Commits May 2020

commits@gajim.org

1 participants
67 discussions

[Git][gajim/python-nbxmpp][master] Fix example client
by Philipp Hörist 07 May '20

07 May '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3eced77c by lovetox at 2020-05-07T17:53:55+02:00 Fix example client - - - - - 1 changed file: - nbxmpp/examples/client.py Changes: ===================================== nbxmpp/examples/client.py ===================================== @@ -15,6 +15,7 @@ import nbxmpp from nbxmpp.protocol import JID from nbxmpp.client import Client from nbxmpp.structs import ProxyData +from nbxmpp.structs import StanzaHandler from nbxmpp.addresses import ServerAddress from nbxmpp.const import ConnectionType from nbxmpp.const import ConnectionProtocol @@ -108,7 +109,7 @@ class TestClient(Gtk.Window): self._client.subscribe('stanza-sent', self._on_stanza_sent) self._client.subscribe('stanza-received', self._on_stanza_received) - self._client.register_handler('message', self._on_message) + self._client.register_handler(StanzaHandler('message', self._on_message)) @property def password(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3eced77ce4d04d15109f98f2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3eced77ce4d04d15109f98f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AccountWizard: Add fallback error message
by Philipp Hörist 06 May '20

06 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 118be135 by lovetox at 2020-05-06T20:23:31+02:00 AccountWizard: Add fallback error message - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -439,9 +439,11 @@ class AccountWizard(Assistant): self._disconnect() def _on_register_error(self, result): - self._show_error_page(_('Error'), - _('Error'), - result.get_text()) + error_text = result.get_text() + if not error_text: + error_text = _('The server rejected the registration ' + 'without an error message') + self._show_error_page(_('Error'), _('Error'), error_text) register_data = result.get_data() if register_data is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/118be135cfbfa2c6f3a598b479954ba6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/118be135cfbfa2c6f3a598b479954ba6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] XMLConsole: Show stanza generated by the AccountWizard
by Philipp Hörist 06 May '20

06 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 507a3cf1 by lovetox at 2020-05-06T17:42:56+02:00 XMLConsole: Show stanza generated by the AccountWizard - - - - - 2 changed files: - gajim/gtk/account_wizard.py - gajim/gtk/xml_console.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -31,6 +31,7 @@ from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import configpaths from gajim.common import helpers +from gajim.common.nec import NetworkEvent from gajim.common.helpers import open_uri from gajim.common.helpers import validate_jid from gajim.common.helpers import get_proxy @@ -236,6 +237,8 @@ class AccountWizard(Assistant): client.subscribe('disconnected', self._on_disconnected) client.subscribe('connection-failed', self._on_connection_failed) + client.subscribe('stanza-sent', self._on_stanza_sent) + client.subscribe('stanza-received', self._on_stanza_received) return client def _disconnect(self): @@ -245,6 +248,18 @@ class AccountWizard(Assistant): self._client.disconnect() self._client = None + @staticmethod + def _on_stanza_sent(_client, _signal_name, stanza): + app.nec.push_incoming_event(NetworkEvent('stanza-sent', + account='AccountWizard', + stanza=stanza)) + + @staticmethod + def _on_stanza_received(_client, _signal_name, stanza): + app.nec.push_incoming_event(NetworkEvent('stanza-received', + account='AccountWizard', + stanza=stanza)) + def _test_credentials(self, ignore_all_errors=False): self._show_progress_page(_('Connecting...'), _('Connecting to server...')) ===================================== gajim/gtk/xml_console.py ===================================== @@ -267,6 +267,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow, EventHelper): for account in accounts: label = app.get_account_label(account) combo_accounts.append((account, label)) + combo_accounts.append(('AccountWizard', 'Account Wizard')) return combo_accounts def _on_filter_options(self, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/507a3cf11a04b37c596c80b70e7a79d0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/507a3cf11a04b37c596c80b70e7a79d0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Replace /me in notification
by Philipp Hörist 05 May '20

05 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8b95c66a by André Apitzsch at 2020-05-05T01:04:09+02:00 MUC: Replace /me in notification - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -325,7 +325,9 @@ class NotificationEvent(nec.NetworkIncomingEvent): sound = msg_obj.gc_control.highlighting_for_message( msg_obj.msgtxt, msg_obj.properties.timestamp)[1] - if msg_obj.properties.muc_nickname != msg_obj.gc_control.nick: + nick = msg_obj.properties.muc_nickname + + if nick != msg_obj.gc_control.nick: self.do_sound = True if sound == 'received': self.sound_event = 'muc_message_received' @@ -364,6 +366,9 @@ class NotificationEvent(nec.NetworkIncomingEvent): if app.config.get('notification_preview_message'): self.popup_text = msg_obj.msgtxt + if self.popup_text and (self.popup_text.startswith('/me ') or + self.popup_text.startswith('/me\n')): + self.popup_text = '* ' + nick + self.popup_text[3:] type_events = ['printed_marked_gc_msg', 'printed_gc_msg'] count = len(app.events.get_events(self.account, self.jid, type_events)) @@ -373,7 +378,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.popup_title = i18n.ngettext( 'New message from %(nickname)s', '%(n_msgs)i unread messages in %(groupchat_name)s', - count) % {'nickname': msg_obj.properties.muc_nickname, + count) % {'nickname': nick, 'n_msgs': count, 'groupchat_name': contact.get_shown_name()} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b95c66ae5a8aeb99906485cd1ba46d2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b95c66ae5a8aeb99906485cd1ba46d2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Dispatcher: Fix unregister_handler()
by Philipp Hörist 03 May '20

03 May '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ba85a309 by lovetox at 2020-05-03T19:26:06+02:00 Dispatcher: Fix unregister_handler() - - - - - 1 changed file: - nbxmpp/dispatcher.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -303,7 +303,7 @@ class StanzaDispatcher(Observable): for handler_dict in self._handlers[xmlns][handler.name][specific]: if handler_dict['func'] != handler.callback: - return + continue try: self._handlers[xmlns][handler.name][specific].remove( View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ba85a309e21e6a19e5949e8a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ba85a309e21e6a19e5949e8a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Read categories from desktop file
by Philipp Hörist 02 May '20

02 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d2fe296d by André Apitzsch at 2020-05-02T19:09:51+02:00 Read categories from desktop file See https://github.com/flathub/flathub/wiki/AppData-Guidelines#icons-and-catego… - - - - - 1 changed file: - data/org.gajim.Gajim.appdata.xml.in Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -38,11 +38,6 @@ <li>Even more features via plugins</li> </ul> </description> - <categories> - <category>GTK</category> - <category>InstantMessaging</category> - <category>Network</category> - </categories> <screenshots> <screenshot type="default"> <image>https://gajim.org/img/screenshots/single-window-mode.png</image> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d2fe296d895e9eaf86b40a52c0eebfbd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d2fe296d895e9eaf86b40a52c0eebfbd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused code
by Philipp Hörist 02 May '20

02 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 78d8015b by lovetox at 2020-05-02T09:22:10+02:00 Remove unused code - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -426,8 +426,6 @@ class PluginManager(metaclass=Singleton): # So just unregister the plugin handlers if con.handlers_registered: for handler in instance.handlers: - if len(handler) > 4: - handler = handler[:4] con.connection.unregister_handler(handler) def activate_plugin(self, plugin): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78d8015b716b616753138cb18adbda24… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78d8015b716b616753138cb18adbda24… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DiscoInfo: Only handle type get
by Philipp Hörist 01 May '20

01 May '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3b8fd415 by lovetox at 2020-05-01T23:09:27+02:00 DiscoInfo: Only handle type get - - - - - 2 changed files: - nbxmpp/modules/discovery.py - nbxmpp/modules/entity_caps.py Changes: ===================================== nbxmpp/modules/discovery.py ===================================== @@ -47,6 +47,7 @@ class Discovery(BaseModule): self.handlers = [ StanzaHandler(name='iq', callback=self._process_disco_info, + typ='get', ns=Namespace.DISCO_INFO, priority=90), ] ===================================== nbxmpp/modules/entity_caps.py ===================================== @@ -36,6 +36,7 @@ class EntityCaps(BaseModule): priority=15), StanzaHandler(name='iq', callback=self._process_disco_info, + typ='get', ns=Namespace.DISCO_INFO, priority=20), ] @@ -68,7 +69,7 @@ class EntityCaps(BaseModule): for feature in self._caps.features: query.addChild('feature', attrs={'var': feature}) - self._log.info('Respond with entity caps') + self._log.info('Respond with disco info') client.send_stanza(iq) raise NodeProcessed View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3b8fd4157ed98750e32dbcfa… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3b8fd4157ed98750e32dbcfa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.2.0-beta1
by Philipp Hörist 01 May '20

01 May '20

Philipp Hörist pushed new tag gajim-1.2.0-beta1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/gajim-1.2.0-beta1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted tag gajim-1.2.0-beta1
by Philipp Hörist 01 May '20

01 May '20

Philipp Hörist deleted tag gajim-1.2.0-beta1 at gajim / gajim -- 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