Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][nbxmpp_2.0] 2.0.1
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: 5fcbb2d1 by lovetox at 2021-02-06T21:16:25+01:00 2.0.1 - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,13 @@ +python-nbxmpp 2.0.1 (07 February 2021) + + New + + * Properties: is_from_us() Method + + Bugfixes + + * Fix handling invalid websocket uris + python-nbxmpp 2.0.0 (29 December 2020) New ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__ = "2.0.0" +__version__ = "2.0.1" ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 2.0.0 +version = 2.0.1 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5fcbb2d1fdcf69b84fa6855a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5fcbb2d1fdcf69b84fa6855a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 65 commits: Windows: Remove dependency on pywin32-ctypes
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: f0746c1e by lovetox at 2021-02-06T17:56:33+01:00 Windows: Remove dependency on pywin32-ctypes The repo seems to be deleted, but we don’t really need this dependency anyway - - - - - 0f487553 by lovetox at 2021-02-06T21:11:01+01:00 Start - - - - - ce38effc by lovetox at 2021-02-06T21:11:01+01:00 Disable CI - - - - - cdf6b0f8 by lovetox at 2021-02-06T21:11:01+01:00 Really disable CI - - - - - 1ff08a6b by lovetox at 2021-02-06T21:11:01+01:00 Add Workspace settings API - - - - - 7a603dea by lovetox at 2021-02-06T21:11:01+01:00 Store and Open chats - - - - - 5cd7d192 by lovetox at 2021-02-06T21:11:01+01:00 Add remove_chat() - - - - - aa039e00 by lovetox at 2021-02-06T21:11:01+01:00 Account Side Bar - - - - - dc672964 by lovetox at 2021-02-06T21:11:01+01:00 Add Workspace Side Bar - - - - - b315ca4a by wurstsalat at 2021-02-06T21:11:01+01:00 ChatList: Add basic elements - - - - - baa66c44 by wurstsalat at 2021-02-06T21:11:01+01:00 ChatListStack: Add Start Chat - - - - - 8805e2aa by wurstsalat at 2021-02-06T21:11:01+01:00 Add basic Sidebar styling - - - - - ff9015db by wurstsalat at 2021-02-06T21:11:01+01:00 Improve styling for Sidebar and ChatList - - - - - 2816a908 by lovetox at 2021-02-06T21:11:01+01:00 Store chatlist on remove - - - - - 2c167bdc by lovetox at 2021-02-06T21:11:01+01:00 Add/Remove Workspaces - - - - - 12af7d05 by lovetox at 2021-02-06T21:11:01+01:00 Allow to add chats to different workspaces - - - - - f7e57e76 by lovetox at 2021-02-06T21:11:01+01:00 Add transparent backgrounds - - - - - 400d1055 by wurstsalat at 2021-02-06T21:11:01+01:00 AccountSideBar: Improve styling - - - - - 5283a07f by wurstsalat at 2021-02-06T21:11:01+01:00 WorkspaceSidebar: Improve styling - - - - - 555b86d3 by lovetox at 2021-02-06T21:11:01+01:00 Improve left sidebar - - - - - 609599b7 by lovetox at 2021-02-06T21:11:01+01:00 css - - - - - 051d4b17 by lovetox at 2021-02-06T21:11:01+01:00 Dont fail when account is disabled - - - - - 18e12ed9 by lovetox at 2021-02-06T21:11:01+01:00 CSS - - - - - 5ac1768f by wurstsalat at 2021-02-06T21:11:01+01:00 AvatarSelector: Add Load Image button - - - - - e0a389df by Daniel Brötzmann at 2021-02-06T21:11:01+01:00 Workspace: Add Workspace edit dialog - - - - - 7b54eb16 by wurstsalat at 2021-02-06T21:11:01+01:00 Workspace: Add title and editing functionality - - - - - 2ab50cd5 by wurstsalat at 2021-02-06T21:11:01+01:00 MainWindow: Add Paned for chat list and chat controls - - - - - b09a5192 by lovetox at 2021-02-06T21:11:02+01:00 Store type for open chats - - - - - 6d815d31 by lovetox at 2021-02-06T21:11:02+01:00 Store workspace dialog settings - - - - - 360dc9c2 by lovetox at 2021-02-06T21:11:02+01:00 Fix adding new Workspace - - - - - 5b6544d5 by lovetox at 2021-02-06T21:11:02+01:00 Fix some selection bugs - - - - - e97d7fe4 by Daniel Brötzmann at 2021-02-06T21:11:02+01:00 ChatListStack: Wrap in ScrolledWindow - - - - - e4466a97 by lovetox at 2021-02-06T21:11:02+01:00 Move scrolled window into gui xml - - - - - b28effe2 by lovetox at 2021-02-06T21:11:02+01:00 sytle chatlist - - - - - f6b23190 by wurstsalat at 2021-02-06T21:11:02+01:00 ChatList: Styling - - - - - 00a5773a by wurstsalat at 2021-02-06T21:11:02+01:00 MainWindow: Styling - - - - - d5aa98f4 by wurstsalat at 2021-02-06T21:11:02+01:00 Accounts: Add basic account page - - - - - 4e683b5e by lovetox at 2021-02-06T21:11:02+01:00 Refactor Groupchats - - - - - fabebe65 by lovetox at 2021-02-06T21:11:02+01:00 Start Chat: Destroy after joining MUC - - - - - 58cad998 by lovetox at 2021-02-06T21:11:02+01:00 Disable Roster - - - - - f9c82ccb by lovetox at 2021-02-06T21:11:02+01:00 Make quit work - - - - - 4aa22022 by lovetox at 2021-02-06T21:11:02+01:00 Stuff - - - - - 27216dba by Daniel Brötzmann at 2021-02-06T21:11:02+01:00 ChatList: Add friendly timestamps - - - - - b5bff671 by Daniel Brötzmann at 2021-02-06T21:11:02+01:00 ChatList: Unread counter styling - - - - - 5d611379 by Daniel Brötzmann at 2021-02-06T21:11:02+01:00 ChatList: Group chat avatars and message lines - - - - - 4f58e42e by Daniel Brötzmann at 2021-02-06T21:11:02+01:00 Paned: Improve ChatList resizing - - - - - 7af475e7 by Daniel Brötzmann at 2021-02-06T21:11:02+01:00 ChatList: Use groupchat name, improve ellipsizing - - - - - 42bb8583 by Daniel Brötzmann at 2021-02-06T21:11:02+01:00 ChatList: Add group chat nicks - - - - - 55480dd1 by lovetox at 2021-02-06T21:11:02+01:00 Remove unread_messages table - - - - - c77d48d2 by lovetox at 2021-02-06T21:11:02+01:00 add unread cache - - - - - b9db0689 by lovetox at 2021-02-06T21:11:02+01:00 Add notifications - - - - - 37c4df1a by lovetox at 2021-02-06T21:11:02+01:00 Fix notifications - - - - - 18d84817 by Daniel Brötzmann at 2021-02-06T21:11:02+01:00 ChatList: Move ui to glade file - - - - - a58ad02d by Daniel Brötzmann at 2021-02-06T21:11:02+01:00 ChatList: Add RosterTooltip - - - - - 550209e8 by lovetox at 2021-02-06T21:11:02+01:00 Move event handling to main - - - - - cc9665cd by lovetox at 2021-02-06T21:11:02+01:00 Fix some events - - - - - be586b1f by lovetox at 2021-02-06T21:11:02+01:00 Reset unread counter - - - - - 312f8852 by lovetox at 2021-02-06T21:11:02+01:00 Fix more events - - - - - 73923784 by wurstsalat at 2021-02-06T21:11:02+01:00 WorkspaceSidebar: Add unread counter - - - - - f70ccaea by lovetox at 2021-02-06T21:11:02+01:00 Unread count improv - - - - - 05bbc1f5 by lovetox at 2021-02-06T21:11:02+01:00 Add unread count to workspace - - - - - 4749a619 by lovetox at 2021-02-06T21:11:02+01:00 Dont allow chats to be opened multiple times - - - - - c1779634 by lovetox at 2021-02-06T21:11:02+01:00 Don’t notify on messages from ourself - - - - - 25cba73b by lovetox at 2021-02-06T21:11:02+01:00 Use consistent jid attribute - - - - - bcad3464 by lovetox at 2021-02-06T21:11:02+01:00 Fix some events - - - - - 30 changed files: - − .gitlab-ci.yml - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/modules/bookmarks.py - gajim/common/modules/chatstates.py - gajim/common/modules/discovery.py - gajim/common/modules/httpupload.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/roster.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/storage/archive.py - gajim/common/storage/cache.py - + gajim/data/gui/chat_list_row.ui - + gajim/data/gui/main.ui - + gajim/data/gui/workspace_dialog.ui - gajim/data/style/gajim.css - gajim/groupchat_control.py - + gajim/gtk/account_page.py - + gajim/gtk/account_side_bar.py - gajim/gtk/avatar.py - gajim/gtk/avatar_selector.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/11d61a25d744aa7940cf9c4b6992c99… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/11d61a25d744aa7940cf9c4b6992c99… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix some events
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 11d61a25 by lovetox at 2021-02-06T20:55:15+01:00 Fix some events - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -34,7 +34,6 @@ from gi.repository import GLib from gi.repository import Gio -from gajim.common import events from gajim.common import app from gajim.common import helpers from gajim.common import ged @@ -42,7 +41,6 @@ from gajim.common.i18n import _ from gajim.common.nec import EventHelper from gajim.common.helpers import AdditionalDataDict -from gajim.common.helpers import event_filter from gajim.common.contacts import GC_Contact from gajim.common.const import Chatstate from gajim.common.structs import OutgoingMessage @@ -56,8 +54,6 @@ from gajim.gui.dialogs import PastePreviewDialog from gajim.gui.message_input import MessageInputTextView from gajim.gui.util import at_the_end -from gajim.gui.util import get_show_in_roster -from gajim.gui.util import get_show_in_systray from gajim.gui.util import get_hardware_key_codes from gajim.gui.util import get_builder from gajim.gui.util import generate_account_badge ===================================== gajim/groupchat_control.py ===================================== @@ -1173,7 +1173,6 @@ def _on_muc_nickname_changed(self, event): self.roster.remove_contact(nick) self.roster.add_contact(new_nick) - @event_filter(['account', 'room_jid']) def _on_muc_user_status_show_changed(self, event): nick = event.properties.muc_nickname status = event.properties.status @@ -1422,7 +1421,6 @@ def _on_muc_destroyed(self, event): if self._wait_for_destruction: self._close_control() - @event_filter(['account', 'jid=room_jid']) def _on_message_sent(self, event): if not event.message: return @@ -1482,7 +1480,6 @@ def send_message(self, message, xhtml=None, process_commands=True): self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() - @event_filter(['account', 'room_jid']) def _on_message_error(self, event): self.conv_textview.show_error(event.message_id, event.error) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11d61a25d744aa7940cf9c4b6992c995… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11d61a25d744aa7940cf9c4b6992c995… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 9 commits: DOAP: Add XEP-0245
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 4ba21a89 by Daniel Brötzmann at 2021-02-06T18:03:22+01:00 DOAP: Add XEP-0245 - - - - - c033d122 by Daniel Brötzmann at 2021-02-06T18:03:22+01:00 DOAP: Use correct RFC strings - - - - - 7ea24519 by lovetox at 2021-02-06T18:03:22+01:00 Rename feather icons - - - - - be722c4d by wurstsalat at 2021-02-06T18:03:22+01:00 Icons: Add missing 16px Feather icons - - - - - a5691d5a by Philipp Hörist at 2021-02-06T18:03:22+01:00 Revert "Rename feather icons" This reverts commit ab451489ac1ce78d8b5d3e097fec440a7c3e7b3f - - - - - 499e7c8b by Daniel Brötzmann at 2021-02-06T18:03:22+01:00 Icons: Generate symbolic feather checkmarks Fixed size symbolic icons have to be generated from SVGs using gtk-encode-symbolic-svg -o outpath feather-check-symbolic.svg 32x32 - - - - - c7a37455 by Daniel Brötzmann at 2021-02-06T18:03:22+01:00 Icons: Convert feather camera and generate fixed size PNGs - - - - - 816a77bd by Daniel Brötzmann at 2021-02-06T18:03:22+01:00 Icons: Add missing feather PNG files - - - - - 6e1e0203 by lovetox at 2021-02-06T18:03:22+01:00 Windows: Remove dependency on pywin32-ctypes The repo seems to be deleted, but we don’t really need this dependency anyway - - - - - 26 changed files: - data/gajim.doap - + gajim/data/icons/hicolor/16x16/devices/feather-briefcase-symbolic.symbolic.png - − gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.symbolic.png - − gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-hash-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-home-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/LICENSE - + gajim/data/icons/hicolor/32x32/devices/feather-briefcase-symbolic.symbolic.png - − gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.symbolic.png - − gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.symbolic.png - − gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.symbolic.png - − gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-hash-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-home-symbolic.symbolic.png - gajim/data/icons/hicolor/scalable/devices/feather-camera-off-symbolic.svg - gajim/data/icons/hicolor/scalable/devices/feather-camera-symbolic.svg - win/_base.sh - win/dev_env.sh Changes: ===================================== data/gajim.doap ===================================== @@ -42,8 +42,8 @@ <implements rdf:resource="https://xmpp.org/rfcs/rfc6120.html" /> <implements rdf:resource="https://xmpp.org/rfcs/rfc6121.html" /> <implements rdf:resource="https://xmpp.org/rfcs/rfc6122.html" /> - <implements rdf:resource="https://tools.ietf.org/html/rfc7395" /> - <implements rdf:resource="https://tools.ietf.org/html/rfc7590" /> + <implements rdf:resource="https://xmpp.org/rfcs/rfc7395.html" /> + <implements rdf:resource="https://xmpp.org/rfcs/rfc7590.html" /> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0004.html" /> @@ -456,6 +456,13 @@ <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0245.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0249.html" /> ===================================== gajim/data/icons/hicolor/16x16/devices/feather-briefcase-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-briefcase-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-hash-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-hash-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-home-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-home-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/LICENSE ===================================== @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-2017 Cole Bemis + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file ===================================== gajim/data/icons/hicolor/32x32/devices/feather-briefcase-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-briefcase-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-hash-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-hash-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-home-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-home-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/scalable/devices/feather-camera-off-symbolic.svg ===================================== @@ -1 +1,64 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-camera-off"><line x1="1" y1="1" x2="23" y2="23"></line><path d="M21 21H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h3m3-3h6l2 3h4a2 2 0 0 1 2 2v9.34m-7.72-2.06a4 4 0 1 1-5.56-5.56"></path></svg> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-camera-off" + version="1.1" + id="svg6" + sodipodi:docname="feather-camera-off-symbolic.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07, custom)"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs10" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1019" + id="namedview8" + showgrid="false" + inkscape:zoom="35.458333" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg6" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 1.0292969 0 A 1 1 0 0 0 0.29296875 0.29296875 A 1 1 0 0 0 0.29296875 1.7070312 L 22.292969 23.707031 A 1 1 0 0 0 23.707031 23.707031 A 1 1 0 0 0 23.707031 22.292969 L 1.7070312 0.29296875 A 1 1 0 0 0 1.0292969 0 z " + id="path840" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 9 2 A 1 1 0 0 0 8 3 A 1 1 0 0 0 9 4 L 14.464844 4 L 16.167969 6.5546875 A 1.0001 1.0001 0 0 0 17 7 L 21 7 C 21.564129 7 22 7.4358706 22 8 L 22 17.339844 A 1 1 0 0 0 23 18.339844 A 1 1 0 0 0 24 17.339844 L 24 8 C 24 6.3549904 22.64501 5 21 5 L 17.535156 5 L 15.832031 2.4453125 A 1.0001 1.0001 0 0 0 15 2 L 9 2 z M 3 5 C 1.3549904 5 0 6.3549904 0 8 L 0 19 C 0 20.64501 1.3549904 22 3 22 L 21 22 A 1 1 0 0 0 22 21 A 1 1 0 0 0 21 20 L 3 20 C 2.4358706 20 2 19.564129 2 19 L 2 8 C 2 7.4358706 2.4358706 7 3 7 L 6 7 A 1 1 0 0 0 7 6 A 1 1 0 0 0 6 5 L 3 5 z M 9.6816406 8.7207031 A 1 1 0 0 0 9.15625 8.8945312 C 6.5894501 10.65089 6.2441315 14.357413 8.4433594 16.556641 C 10.642587 18.755869 14.34911 18.41055 16.105469 15.84375 A 1 1 0 0 0 15.84375 14.455078 A 1 1 0 0 0 14.455078 14.714844 C 13.382793 16.281916 11.200086 16.485242 9.8574219 15.142578 C 8.5147581 13.799914 8.7180837 11.617207 10.285156 10.544922 A 1 1 0 0 0 10.544922 9.15625 A 1 1 0 0 0 9.6816406 8.7207031 z " + id="path844" /> +</svg> ===================================== gajim/data/icons/hicolor/scalable/devices/feather-camera-symbolic.svg ===================================== @@ -1 +1,64 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-camera"><path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"></path><circle cx="12" cy="13" r="4"></circle></svg> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-camera" + version="1.1" + id="svg6" + sodipodi:docname="feather-camera-symbolic.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07, custom)"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs10" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1019" + id="namedview8" + showgrid="false" + inkscape:zoom="35.458333" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg6" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 9 2 A 1.0001 1.0001 0 0 0 8.1679688 2.4453125 L 6.4648438 5 L 3 5 C 1.3549904 5 0 6.3549904 0 8 L 0 19 C 0 20.64501 1.3549904 22 3 22 L 21 22 C 22.64501 22 24 20.64501 24 19 L 24 8 C 24 6.3549904 22.64501 5 21 5 L 17.535156 5 L 15.832031 2.4453125 A 1.0001 1.0001 0 0 0 15 2 L 9 2 z M 9.5351562 4 L 14.464844 4 L 16.167969 6.5546875 A 1.0001 1.0001 0 0 0 17 7 L 21 7 C 21.564129 7 22 7.4358706 22 8 L 22 19 C 22 19.564129 21.564129 20 21 20 L 3 20 C 2.4358706 20 2 19.564129 2 19 L 2 8 C 2 7.4358706 2.4358706 7 3 7 L 7 7 A 1.0001 1.0001 0 0 0 7.8320312 6.5546875 L 9.5351562 4 z " + id="path844" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 12 8 C 9.2504209 8 7 10.250421 7 13 C 7 15.749579 9.2504209 18 12 18 C 14.749579 18 17 15.749579 17 13 C 17 10.250421 14.749579 8 12 8 z M 12 10 C 13.668699 10 15 11.331301 15 13 C 15 14.668699 13.668699 16 12 16 C 10.331301 16 9 14.668699 9 13 C 9 11.331301 10.331301 10 12 10 z " + id="path840" /> +</svg> ===================================== win/_base.sh ===================================== @@ -99,7 +99,6 @@ function install_deps { PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git@nbxmpp_2.0 git+https://dev.gajim.org/lovetox/pybonjour-python3.git -git+https://github.com/enthought/pywin32-ctypes.git keyring python-gnupg python-axolotl ===================================== win/dev_env.sh ===================================== @@ -27,7 +27,6 @@ function main { PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git -git+https://github.com/enthought/pywin32-ctypes.git python-axolotl python-gnupg keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0dd1b79669a9e078f88875ad4399e79… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0dd1b79669a9e078f88875ad4399e79… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Remove dependency on pywin32-ctypes
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: f0746c1e by lovetox at 2021-02-06T17:56:33+01:00 Windows: Remove dependency on pywin32-ctypes The repo seems to be deleted, but we don’t really need this dependency anyway - - - - - 2 changed files: - win/_base.sh - win/dev_env.sh Changes: ===================================== win/_base.sh ===================================== @@ -99,7 +99,6 @@ function install_deps { PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git -git+https://github.com/enthought/pywin32-ctypes.git keyring python-gnupg python-axolotl ===================================== win/dev_env.sh ===================================== @@ -27,7 +27,6 @@ function main { PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git -git+https://github.com/enthought/pywin32-ctypes.git python-axolotl python-gnupg keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f0746c1e4905a67578e478da95879c46… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f0746c1e4905a67578e478da95879c46… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] Dispatcher: Pass correct arguments
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: f9b053fe by lovetox at 2021-02-06T17:41:54+01:00 Dispatcher: Pass correct arguments - - - - - 1 changed file: - nbxmpp/old_dispatcher.py Changes: ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -555,7 +555,7 @@ class XMPPDispatcher(PlugIn): return own_jid = self._owner.get_bound_jid() - properties = get_properties_struct(name) + properties = get_properties_struct(name, own_jid) if name == 'iq': if stanza.getFrom() is None and own_jid is not None: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f9b053fe4f18cd801ac85769… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f9b053fe4f18cd801ac85769… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Dispatcher: Pass correct arguments
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e043660b by lovetox at 2021-02-06T17:36:04+01:00 Dispatcher: Pass correct arguments - - - - - 1 changed file: - nbxmpp/old_dispatcher.py Changes: ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -555,7 +555,7 @@ class XMPPDispatcher(PlugIn): return own_jid = self._owner.get_bound_jid() - properties = get_properties_struct(name) + properties = get_properties_struct(name, own_jid) if name == 'iq': if stanza.getFrom() is None and own_jid is not None: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e043660b28cf2682edd050fc… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e043660b28cf2682edd050fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Properties: Add is_from_us()
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8ff675f5 by lovetox at 2021-02-06T17:29:39+01:00 Properties: Add is_from_us() - - - - - 3 changed files: - nbxmpp/dispatcher.py - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -369,7 +369,7 @@ class StanzaDispatcher(Observable): return own_jid = self._client.get_bound_jid() - properties = get_properties_struct(name) + properties = get_properties_struct(name, own_jid) if name == 'iq': if stanza.getFrom() is None and own_jid is not None: ===================================== nbxmpp/structs.py ===================================== @@ -649,7 +649,8 @@ class Properties: class MessageProperties: - def __init__(self): + def __init__(self, own_jid): + self._own_jid = own_jid self.carbon = None self.type = MessageType.NORMAL self.id = None @@ -696,6 +697,14 @@ class MessageProperties: self.security_label = None self.chatstate = None + def is_from_us(self, bare_match=True): + if self.from_ is None: + raise ValueError('from attribute missing') + + if bare_match: + return self._own_jid.bare_match(self.from_) + return self._own_jid == self.from_ + @property def has_user_delay(self): return self.user_timestamp is not None @@ -813,7 +822,8 @@ class MessageProperties: class IqProperties: - def __init__(self): + def __init__(self, own_jid): + self._own_jid = own_jid self.type = None self.jid = None self.id = None @@ -838,7 +848,8 @@ class IqProperties: class PresenceProperties: - def __init__(self): + def __init__(self, own_jid): + self._own_jid = own_jid self.type = None self.priority = None self.show = None ===================================== nbxmpp/util.py ===================================== @@ -70,13 +70,13 @@ def b64encode(data, return_type=str): return result.decode() -def get_properties_struct(name): +def get_properties_struct(name, own_jid): if name == 'message': - return MessageProperties() + return MessageProperties(own_jid) if name == 'iq': - return IqProperties() + return IqProperties(own_jid) if name == 'presence': - return PresenceProperties() + return PresenceProperties(own_jid) return Properties() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8ff675f5ca9ede452cc48354… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8ff675f5ca9ede452cc48354… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] Properties: Add is_from_us()
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: 3d8345c7 by lovetox at 2021-02-06T13:47:36+01:00 Properties: Add is_from_us() - - - - - 3 changed files: - nbxmpp/dispatcher.py - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -369,7 +369,7 @@ class StanzaDispatcher(Observable): return own_jid = self._client.get_bound_jid() - properties = get_properties_struct(name) + properties = get_properties_struct(name, own_jid) if name == 'iq': if stanza.getFrom() is None and own_jid is not None: ===================================== nbxmpp/structs.py ===================================== @@ -649,7 +649,8 @@ class Properties: class MessageProperties: - def __init__(self): + def __init__(self, own_jid): + self._own_jid = own_jid self.carbon = None self.type = MessageType.NORMAL self.id = None @@ -696,6 +697,14 @@ class MessageProperties: self.security_label = None self.chatstate = None + def is_from_us(self, bare_match=True): + if self.from_ is None: + raise ValueError('from attribute missing') + + if bare_match: + return self._own_jid.bare_match(self.from_) + return self._own_jid == self.from_ + @property def has_user_delay(self): return self.user_timestamp is not None @@ -813,7 +822,8 @@ class MessageProperties: class IqProperties: - def __init__(self): + def __init__(self, own_jid): + self._own_jid = own_jid self.type = None self.jid = None self.id = None @@ -838,7 +848,8 @@ class IqProperties: class PresenceProperties: - def __init__(self): + def __init__(self, own_jid): + self._own_jid = own_jid self.type = None self.priority = None self.show = None ===================================== nbxmpp/util.py ===================================== @@ -70,13 +70,13 @@ def b64encode(data, return_type=str): return result.decode() -def get_properties_struct(name): +def get_properties_struct(name, own_jid): if name == 'message': - return MessageProperties() + return MessageProperties(own_jid) if name == 'iq': - return IqProperties() + return IqProperties(own_jid) if name == 'presence': - return PresenceProperties() + return PresenceProperties(own_jid) return Properties() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3d8345c7ea51b7b248161e2f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3d8345c7ea51b7b248161e2f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Use consistent jid attribute
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: aa5895bd by lovetox at 2021-02-06T16:54:58+01:00 Use consistent jid attribute - - - - - 10 changed files: - gajim/common/modules/discovery.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gui_interface.py - gajim/message_window.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== @@ -234,7 +234,7 @@ def disco_muc(self, app.nec.push_incoming_event(NetworkEvent( 'muc-disco-update', account=self._account, - room_jid=result.info.jid)) + jid=result.info.jid)) yield result ===================================== gajim/common/modules/message.py ===================================== @@ -160,11 +160,6 @@ def _message_received(self, _con, stanza, properties): parse_oob(properties, additional_data) parse_xhtml(properties, additional_data) - app.nec.push_incoming_event(NetworkEvent('update-client-info', - account=self._account, - jid=jid, - resource=resource)) - if properties.is_encrypted: additional_data['encrypted'] = properties.encrypted.additional_data else: ===================================== gajim/common/modules/muc.py ===================================== @@ -190,7 +190,7 @@ def _on_disco_result(self, task): app.nec.push_incoming_event( NetworkEvent('muc-join-failed', account=self._account, - room_jid=error.jid.bare, + jid=error.jid.bare, error=error)) return @@ -269,7 +269,7 @@ def _on_room_config(self, task): app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-failed', account=self._account, - room_jid=error.jid, + jid=error.jid, error=error)) return @@ -302,7 +302,7 @@ def _on_config_result(self, task): app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-failed', account=self._account, - room_jid=error.jid, + jid=error.jid, error=error)) return @@ -338,7 +338,7 @@ def _on_disco_result_after_config(self, task): app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-finished', account=self._account, - room_jid=jid)) + jid=jid)) def update_presence(self): mucs = self._manager.get_mucs_with_state([MUCJoinedState.JOINED, @@ -382,7 +382,7 @@ def _on_error_presence(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-join-failed', account=self._account, - room_jid=room_jid, + jid=room_jid, error=properties.error)) elif muc_data.state == MUCJoinedState.CREATING: @@ -390,14 +390,14 @@ def _on_error_presence(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-creation-failed', account=self._account, - room_jid=room_jid, + jid=room_jid, error=properties.error)) elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: app.nec.push_incoming_event( NetworkEvent('muc-captcha-error', account=self._account, - room_jid=room_jid, + jid=room_jid, error_text=to_user_string(properties.error))) self._manager.set_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) @@ -572,7 +572,7 @@ def _raise_muc_event(self, event_name, properties): app.nec.push_incoming_event( NetworkEvent(event_name, account=self._account, - room_jid=properties.jid.bare, + jid=properties.jid.bare, properties=properties)) self._log_muc_event(event_name, properties) @@ -654,7 +654,7 @@ def _handle_subject_change(self, room_jid, subject, nickname, timestamp): app.nec.push_incoming_event( NetworkEvent('muc-subject', account=self._account, - room_jid=room_jid, + jid=room_jid, subject=subject, nickname=nickname, user_timestamp=timestamp, @@ -666,7 +666,7 @@ def _handle_subject_change(self, room_jid, subject, nickname, timestamp): app.nec.push_incoming_event( NetworkEvent('muc-joined', account=self._account, - room_jid=muc_data.jid)) + jid=muc_data.jid)) def _room_join_complete(self, muc_data): self._remove_join_timeout(muc_data.jid) @@ -697,7 +697,7 @@ def _on_voice_request(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-voice-request', account=self._account, - room_jid=str(properties.muc_jid), + jid=str(properties.muc_jid), voice_request=properties.voice_request)) raise nbxmpp.NodeProcessed @@ -734,7 +734,7 @@ def _on_captcha_challenge(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-captcha-challenge', account=self._account, - room_jid=properties.jid.bare, + jid=properties.jid.bare, form=properties.captcha.form)) raise nbxmpp.NodeProcessed @@ -767,7 +767,7 @@ def _on_captcha_result(self, task): app.nec.push_incoming_event( NetworkEvent('muc-captcha-error', account=self._account, - room_jid=str(error.jid), + jid=str(error.jid), error_text=to_user_string(error))) def _on_config_change(self, _con, _stanza, properties): @@ -780,7 +780,7 @@ def _on_config_change(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-config-changed', account=self._account, - room_jid=room_jid, + jid=room_jid, status_codes=properties.muc_status_codes)) raise nbxmpp.NodeProcessed ===================================== gajim/groupchat_control.py ===================================== @@ -460,8 +460,6 @@ def _get_current_page(self): return self.xml.stack.get_visible_child_name() def _on_muc_disco_update(self, _event): - if self.parent_win is None: - return self.update_actions() self.draw_banner_text() @@ -765,10 +763,12 @@ def draw_banner_text(self): """ self.xml.banner_name_label.set_text(self.room_name) - @event_filter(['jid=room_jid']) - def _on_update_room_avatar(self, event): + def _on_update_room_avatar(self, _event): self._update_avatar() + def _on_update_gc_avatar(self, event): + self.roster.process_avatar_update(event) + def _on_bookmarks_received(self, _event): self.draw_banner_text() ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -161,9 +161,5 @@ def process_event(self, event): if event.name not in HANDLED_EVENTS: return - if hasattr(event, 'jid'): - jid = event.jid - else: - jid = event.room_jid - chat_list = self._find_chat(event.account, jid) + chat_list = self._find_chat(event.account, event.jid) chat_list.process_event(event) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -89,9 +89,5 @@ def clear(self): self.set_visible_child_name('empty') def process_event(self, event): - if hasattr(event, 'jid'): - jid = event.jid - else: - jid = event.room_jid - control = self.get_control(event.account, jid) + control = self.get_control(event.account, event.jid) control.process_event(event) ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -102,7 +102,6 @@ def __init__(self, account, room_jid, control): self.register_events([ ('theme-update', ged.GUI2, self._on_theme_update), - ('update-gc-avatar', ged.GUI1, self._on_avatar_update), ]) @staticmethod @@ -458,8 +457,7 @@ def get_role(self, nick): def _on_theme_update(self, _event): self.redraw() - @event_filter(['room_jid']) - def _on_avatar_update(self, event): + def process_avatar_update(self, event): self.draw_avatar(event.contact) def clear(self): ===================================== gajim/gtk/main.py ===================================== @@ -72,7 +72,6 @@ def __init__(self): ('activity-received', ged.GUI1, self._on_event), ('tune-received', ged.GUI1, self._on_event), ('location-received', ged.GUI1, self._on_event), - ('update-client-info', ged.GUI1, self._on_event), ('chatstate-received', ged.GUI1, self._on_event), ('caps-update', ged.GUI1, self._on_event), ('message-sent', ged.OUT_POSTCORE, self._on_event), @@ -82,8 +81,9 @@ def __init__(self): ('receipt-received', ged.GUI1, self._on_event), ('displayed-received', ged.GUI1, self._on_event), ('message-error', ged.GUI1, self._on_event), - ('zeroconf-error', ged.GUI1, self._on_event), ('update-roster-avatar', ged.GUI1, self._on_event), + ('update-room-avatar', ged.GUI1, self._on_event), + ('update-gc-avatar', ged.GUI1, self._on_event), ('muc-creation-failed', ged.GUI1, self._on_event), ('muc-joined', ged.GUI1, self._on_event), ('muc-join-failed', ged.GUI1, self._on_event), @@ -106,8 +106,6 @@ def __init__(self): ('muc-disco-update', ged.GUI1, self._on_event), ('muc-configuration-finished', ged.GUI1, self._on_event), ('muc-configuration-failed', ged.GUI1, self._on_event), - ('update-room-avatar', ged.GUI1, self._on_event), - ('message-error', ged.GUI1, self._on_event), ]) self.show_all() @@ -299,22 +297,13 @@ def _on_edit_workspace_clicked(self, _button): workspace_id=self.get_active_workspace()) def _on_event(self, event): - if hasattr(event, 'jid'): - jid = event.jid - else: - jid = event.room_jid - if event.name == 'caps-update': #TODO return - if event.name == 'update-client-info': - #TODO - return - - if not self.chat_exists(event.account, jid): + if not self.chat_exists(event.account, event.jid): if event.name == 'message-received': - self.add_chat(event.account, jid, 'contact') + self.add_chat(event.account, event.jid, 'contact') else: # No chat is open, dont handle any gui events return ===================================== gajim/gui_interface.py ===================================== @@ -1855,8 +1855,9 @@ def update_avatar(self, account=None, jid=None, NetworkEvent('update-roster-avatar', account=account, jid=jid)) else: app.nec.push_incoming_event(NetworkEvent('update-gc-avatar', + account=account, contact=contact, - room_jid=contact.room_jid)) + jid=contact.room_jid)) def save_avatar(self, data): return self.avatar_storage.save_avatar(data) ===================================== gajim/message_window.py ===================================== @@ -162,9 +162,9 @@ def __init__(self, acct, type_, parent_window=None, parent_paned=None): self.notebook.set_show_border(app.settings.get('tabs_border')) self.show_icon() - self.register_events([ - ('muc-disco-update', ged.GUI1, self._on_muc_disco_update), - ]) + # self.register_events([ + # ('muc-disco-update', ged.GUI1, self._on_muc_disco_update), + # ]) def _add_actions(self): actions = [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa5895bdb33c289893d56bdd79cf438f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa5895bdb33c289893d56bdd79cf438f… 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