Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 4 commits: fix: GroupChat: Handle nickname changes correctly
by Philipp Hörist (＠lovetox) 13 Aug '22

13 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 843b6f1d by lovetox at 2022-08-13T17:19:01+02:00 fix: GroupChat: Handle nickname changes correctly - - - - - c90c3353 by lovetox at 2022-08-13T17:48:22+02:00 refactor: GED: Prevent registering events multiple times - - - - - de8cb97b by lovetox at 2022-08-13T17:48:22+02:00 refactor: ChatBanner: Simplify phone image logic - - - - - ba7e88c2 by lovetox at 2022-08-13T18:06:43+02:00 refactor: ChatBanner: Register events only once - - - - - 6 changed files: - gajim/common/ged.py - gajim/common/modules/muc.py - gajim/gtk/chat_banner.py - gajim/gtk/control.py - gajim/gtk/groupchat_nick_completion.py - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/common/ged.py ===================================== @@ -57,6 +57,10 @@ def register_event_handler(self, if event_name in self.handlers: handlers_list = self.handlers[event_name] + if (priority, handler) in handlers_list: + # Don’t register same handler/prio multiple times + return + i = 0 for i, handler_tuple in enumerate(handlers_list): if priority < handler_tuple[0]: @@ -122,11 +126,16 @@ def register_event(self, priority: int, handler: HandlerFuncT) -> None: + if (event_name, priority, handler) in self.__event_handlers: + return + self.__event_handlers.append((event_name, priority, handler)) app.ged.register_event_handler(event_name, priority, handler) def register_events(self, events: list[EventHandlerT]) -> None: for handler in events: + if handler in self.__event_handlers: + continue self.__event_handlers.append(handler) app.ged.register_event_handler(*handler) ===================================== gajim/common/modules/muc.py ===================================== @@ -575,21 +575,21 @@ def _on_muc_user_presence(self, properties.jid, properties.muc_user.nick) - # Create a copy of the contact object - new_occupant = room.add_resource(properties.muc_user.nick) + # We receive only the unavailable presence here, so we take + # the current presence and create a new contact with it, before we + # update the precence. + nickname = properties.muc_user.nick + new_occupant = room.add_resource(nickname) new_occupant.set_presence(occupant.presence) + self._joined_users[room.jid][nickname] = occupant.presence presence = self._process_user_presence(properties) occupant.update_presence(presence, properties) - # new_nick = properties.muc_user.nick - # nick = properties.muc_nickname - # presence_dict = self._joined_users[properties.jid.bare] - # presence_dict[new_nick] = presence_dict.pop(nick) - # self._manager.change_nickname - # TODO remove presence from manager - - room.notify('user-nickname-changed', occupant, properties) + room.notify('user-nickname-changed', + occupant, + new_occupant, + properties) return is_joined = self._is_user_joined(properties.jid) ===================================== gajim/gtk/chat_banner.py ===================================== @@ -117,16 +117,18 @@ def switch_contact(self, contact: types.ChatContactT) -> None: 'user-joined': self._on_user_state_changed, 'user-left': self._on_user_state_changed, 'user-avatar-update': self._on_user_avatar_update, - 'user-nickname-changed': self._on_user_nickname_changed }) - self.register_events([ - ('message-received', ged.GUI1, self._on_message_received), - ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), - ('muc-disco-update', ged.GUI1, self._on_muc_disco_update), - ('account-enabled', ged.GUI2, self._on_account_changed), - ('account-disabled', ged.GUI2, self._on_account_changed) - ]) + if not self.has_events_registered(): + self.register_events([ + ('message-received', ged.GUI2, self._on_message_received), + ('muc-disco-update', ged.GUI2, self._on_muc_disco_update), + ('bookmarks-received', ged.GUI2, self._on_bookmarks_received), + ('account-enabled', ged.GUI2, self._on_account_changed), + ('account-disabled', ged.GUI2, self._on_account_changed) + ]) + + self._ui.phone_image.set_visible(False) if hide_banner: self.set_no_show_all(True) @@ -188,15 +190,6 @@ def _on_user_role_changed(self, user_contact: GroupchatParticipant, properties: PresenceProperties ) -> None: - self._update_content() - - def _on_user_nickname_changed(self, - user_contact: GroupchatParticipant, - _signal_name: str, - properties: PresenceProperties, - ) -> None: - if user_contact.name != properties.muc_nickname: - return self._update_content() @@ -207,45 +200,32 @@ def _on_user_avatar_update(self, *args: Any) -> None: self._update_avatar() def _on_bookmarks_received(self, _event: BookmarksReceived) -> None: + if not isinstance(self._contact, GroupchatContact): + return + self._update_content() def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: - if self._contact is None or event.jid != self._contact.jid: + assert self._contact is not None + if event.jid != self._contact.jid: return self._update_content() def _on_account_changed(self, event: AccountEnabled) -> None: - if self._contact is None: - return - + assert self._contact is not None self._update_account_badge(self._contact.account) def _on_message_received(self, event: MessageReceived) -> None: - if not event.msgtxt: - return - - if event.properties.is_sent_carbon: - return - - assert self._contact is not None - - if event.jid != self._contact.jid: - return - - self._ui.phone_image.set_visible(False) - - if isinstance(self._contact, ( - GroupchatContact, GroupchatParticipant)): - return - - kind = 'outgoing' if event.properties.is_sent_carbon else 'incoming' - if kind == 'outgoing': + if (not isinstance(self._contact, BareContact) or + event.jid != self._contact.jid or + not event.msgtxt or + event.properties.is_sent_carbon or + event.resource is None): return - if event.resource is not None and not self._contact.is_groupchat: - resource_contact = self._contact.get_resource(event.resource) - self._ui.phone_image.set_visible(resource_contact.is_phone) + resource_contact = self._contact.get_resource(event.resource) + self._ui.phone_image.set_visible(resource_contact.is_phone) def _update_avatar(self) -> None: scale = app.window.get_scale_factor() ===================================== gajim/gtk/control.py ===================================== @@ -174,9 +174,6 @@ def switch_contact(self, contact: Union[BareContact, if isinstance(contact, GroupchatParticipant): contact.multi_connect({ 'user-status-show-changed': self._on_user_status_show_changed, - # 'user-nickname-changed': self._on_user_nickname_changed, - # 'room-kicked': self._on_room_kicked, - # 'room-destroyed': self._on_room_destroyed, }) elif isinstance(contact, GroupchatContact): @@ -187,7 +184,7 @@ def switch_contact(self, contact: Union[BareContact, 'user-role-changed': self._on_user_role_changed, 'user-status-show-changed': self._on_muc_user_status_show_changed, - # 'user-nickname-changed': self._on_user_nickname_changed, + 'user-nickname-changed': self._on_user_nickname_changed, 'room-kicked': self._on_room_kicked, 'room-destroyed': self._on_room_destroyed, 'room-config-finished': self._on_room_config_finished, @@ -693,27 +690,21 @@ def add_message(self, additional_data=additional_data) def _on_user_nickname_changed(self, - _user_contact: GroupchatParticipant, + contact: types.GroupchatContact, _signal_name: str, - properties: PresenceProperties, + old_contact: types.GroupchatParticipant, + new_contact: types.GroupchatParticipant, + properties: PresenceProperties ) -> None: - # TODO: check if the nick logic makes sense - return - # if isinstance(self.contact, GroupchatContact): - # nick = user_contact.name - # else: - # nick = properties.muc_nickname - - # assert properties.muc_user is not None - # new_nick = properties.muc_user.nick - # if properties.is_muc_self_presence: - # message = _('You are now known as %s') % new_nick - # else: - # message = _('{nick} is now known ' - # 'as {new_nick}').format(nick=nick, new_nick=new_nick) - - # self.add_info_message(message) + if properties.is_muc_self_presence: + message = _('You are now known as %s') % new_contact.name + else: + message = _('{nick} is now known ' + 'as {new_nick}').format(nick=old_contact.name, + new_nick=new_contact.name) + + self.add_info_message(message) def _on_muc_user_status_show_changed(self, contact: GroupchatContact, ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -78,16 +78,17 @@ def switch_contact(self, contact: types.GroupchatContactT) -> None: def _on_user_nickname_changed(self, _contact: types.GroupchatContact, _signal_name: str, - user_contact: types.GroupchatParticipant, + old_contact: types.GroupchatParticipant, + new_contact: types.GroupchatParticipant, properties: PresenceProperties ) -> None: + if properties.is_muc_self_presence: return - old_name = user_contact.name - assert properties.muc_user - new_name = properties.muc_user.nick - assert new_name is not None + old_name = old_contact.name + new_name = new_contact.name + log.debug('Contact %s renamed to %s', old_name, new_name) for lst in (self._highlight_list, self._sender_list): for idx, contact in enumerate(lst): ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -283,16 +283,13 @@ def _update_contact(self, def _on_user_nickname_changed(self, contact: types.GroupchatContact, _signal_name: str, - user_contact: types.GroupchatParticipant, + old_contact: types.GroupchatParticipant, + new_contact: types.GroupchatParticipant, properties: PresenceProperties ) -> None: - self._remove_contact(user_contact) - - assert properties.muc_user is not None - assert properties.muc_user.nick is not None - user_contact = contact.get_resource(properties.muc_user.nick) - self._add_contact(user_contact) + self._remove_contact(old_contact) + self._add_contact(new_contact) def _on_user_status_show_changed(self, _contact: types.GroupchatContact, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0835a88652ee14c9e9b6889acdc15b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0835a88652ee14c9e9b6889acdc15b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Roster: Add missing contact-info action
by Daniel Brötzmann (＠wurstsalat) 13 Aug '22

13 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0835a886 by wurstsalat at 2022-08-13T12:49:44+02:00 fix: Roster: Add missing contact-info action - - - - - 2 changed files: - gajim/gtk/const.py - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/const.py ===================================== @@ -220,6 +220,7 @@ def __str__(self): ACCOUNT_ACTIONS = [ ('add-contact', 'as'), + ('contact-info', 's'), ('block-contact', 's'), ('remove-contact', 's'), ('execute-command', 's'), @@ -250,6 +251,7 @@ def __str__(self): ONLINE_ACCOUNT_ACTIONS = { 'add-contact', 'remove-contact', + 'contact-info', 'execute-command', 'modify-gateway', 'bookmarks', ===================================== gajim/gtk/roster.py ===================================== @@ -140,6 +140,7 @@ def __init__(self, account: str) -> None: def _connect_actions(self): app_actions = [ + (f'{self._account}-contact-info', self._on_contact_info), (f'{self._account}-modify-gateway', self._on_modify_gateway), (f'{self._account}-execute-command', self._on_execute_command), (f'{self._account}-block-contact', self._on_block_contact), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0835a88652ee14c9e9b6889acdc15b50… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0835a88652ee14c9e9b6889acdc15b50… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Fix switch-next-unread-tab action work
by Philipp Hörist (＠lovetox) 13 Aug '22

13 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 53714f8e by lovetox at 2022-08-13T12:31:48+02:00 fix: Fix switch-next-unread-tab action work - - - - - c57682ce by lovetox at 2022-08-13T12:31:48+02:00 imprv: Chatstate: Don’t make too many assumptions - active does not necessarily mean the user looks at the chat - gone: In todays chat clients there is no difference between closing a chat and not looking at it or switching to another chat. In both cases the user gets notified if new messages arrive, its not clear how this informtation can be important for our users. Further for communicating idle states there are more useful mechanisms like idle presence and presence show states. - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gtk/main.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -309,17 +309,12 @@ def get_uf_chatstate(chatstate: str) -> str: ''' Remove chatstate jargon and returns user friendly messages ''' - if chatstate == 'active': - return _('is paying attention to the conversation') - if chatstate == 'inactive': + if chatstate in ('inactive', 'gone'): return _('is doing something else') if chatstate == 'composing': return _('is composing a message…') if chatstate == 'paused': - # paused means he or she was composing but has stopped for a while return _('paused composing a message') - if chatstate == 'gone': - return _('has closed the chat window or tab') return '' ===================================== gajim/gtk/main.py ===================================== @@ -358,7 +358,7 @@ def _add_actions2(self) -> None: 'close-tab', 'switch-next-tab', 'switch-prev-tab', - 'switch-next-unread-tab' + 'switch-next-unread-tab', 'switch-prev-unread-tab', 'switch-tab-1', 'switch-tab-2', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b8dfaf8e5c11d1e4aa1dafa1939f10a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b8dfaf8e5c11d1e4aa1dafa1939f10a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatBanner: Use correct scaling for chatstates
by Daniel Brötzmann (＠wurstsalat) 13 Aug '22

13 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b8dfaf8e by wurstsalat at 2022-08-13T12:30:25+02:00 fix: ChatBanner: Use correct scaling for chatstates - - - - - 1 changed file: - gajim/gtk/chat_banner.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -280,7 +280,7 @@ def _update_content(self) -> None: chatstate = '' label_text = f'{name}' \ - f'' \ + f'' \ f' {chatstate}' label_tooltip = f'{name} {chatstate}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8dfaf8e5c11d1e4aa1dafa1939f10ae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8dfaf8e5c11d1e4aa1dafa1939f10ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: CSSConfig: Remove whitespace from blank line
by Daniel Brötzmann (＠wurstsalat) 13 Aug '22

13 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d06ef306 by wurstsalat at 2022-08-13T10:39:11+02:00 cq: CSSConfig: Remove whitespace from blank line - - - - - 1 changed file: - gajim/gtk/css_config.py Changes: ===================================== gajim/gtk/css_config.py ===================================== @@ -116,7 +116,7 @@ def __init__(self) -> None: self._load_default() self._load_selected() self._activate_theme() - + Gtk.StyleContext.add_provider_for_screen( Gdk.Screen.get_default(), self._provider, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d06ef306cb6844353cc317b60ca90463… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d06ef306cb6844353cc317b60ca90463… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: CSS: Use relative sizes for fonts
by Daniel Brötzmann (＠wurstsalat) 13 Aug '22

13 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c08ccb30 by wurstsalat at 2022-08-13T10:28:37+02:00 imprv: CSS: Use relative sizes for fonts - - - - - 0da402a7 by wurstsalat at 2022-08-13T10:30:25+02:00 imprv: Windows: Increase default font size - - - - - 3 changed files: - gajim/common/const.py - gajim/data/style/gajim.css - gajim/gtk/css_config.py Changes: ===================================== gajim/common/const.py ===================================== @@ -163,6 +163,7 @@ class StyleAttr(Enum): @unique class CSSPriority(IntEnum): + PRE_APPLICATION = 599 APPLICATION = 600 APPLICATION_DARK = 601 DEFAULT_THEME = 610 ===================================== gajim/data/style/gajim.css ===================================== @@ -92,19 +92,19 @@ .conversation-call-box { padding: 12px; } .conversation-call-box label { - font-size: small; + font-size: 90%; } .conversation-meta { color: @insensitive_fg_color; - font-size: small; + font-size: 90%; } .conversation-read-marker { color: @insensitive_fg_color; - font-size: small; + font-size: 90%; font-style: italic; } .conversation-nickname { - font-size: small; + font-size: 90%; font-weight: bold; } .code-widget { @@ -120,7 +120,7 @@ .code-widget-header { border-top-right-radius: 3px; } .code-widget-header label { - font-size: small; + font-size: 90%; } .code-widget-header button { padding: 0; @@ -172,7 +172,7 @@ .selection-bar { border-bottom-right-radius: 6px; } .small-label { - font-size: small; + font-size: 90%; } /* ChatList with Workspace and Account sidebars */ @@ -399,7 +399,7 @@ .header-box label { padding: 12px 18px 6px 18px; font-weight: bold; color: @insensitive_fg_color; - font-size: small; + font-size: 90%; } .header-box-first label { padding: 0px 18px 6px 18px; @@ -418,7 +418,7 @@ .search-view-row-grid textview text { background: transparent; } .search-view-row-grid label { - font-size: small; + font-size: 90%; } .search-view-counter label { font-style: italic; @@ -428,7 +428,7 @@ .search-view-header { padding: 12px 6px 6px 6px; } .search-view-header label { - font-size: small; + font-size: 90%; color: @insensitive_fg_color; } @@ -439,7 +439,7 @@ .resource-selector list row { /* Profile window */ #NicknameEntry:disabled { - font-size: 28px; + font-size: 2.3rem; font-weight: bold; border: none; padding: 0px 0px 0px 0px; @@ -484,7 +484,7 @@ .stack-header { padding: 9px 9px; } #ContactNameEntry:disabled { - font-size: 24px; + font-size: 2.0rem; font-weight: bold; border: none; padding: 0px 0px 0px 0px; @@ -494,25 +494,25 @@ #ContactNameEntry:disabled { /* Emoticon Popover */ popover#EmoticonPopover button { background: none; border: none; box-shadow:none; padding: 0px;} -popover#EmoticonPopover button > label { font-size: 24px; } -popover#EmoticonPopover flowboxchild > label { font-size: 24px; } +popover#EmoticonPopover button > label { font-size: 2.0rem; } +popover#EmoticonPopover flowboxchild > label { font-size: 2.0rem; } popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } popover#EmoticonPopover scrolledwindow { border: none; } popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_color; } -.emoji-chooser-heading { font-size: 13px; font-weight: bold; padding: 5px;} +.emoji-chooser-heading { font-size: 1.15rem; font-weight: bold; padding: 5px;} .emoji-chooser-flowbox { padding-left: 5px; padding-right: 11px; } .emoji-modifier-chooser-flowbox { padding-left: 5px; } /* HistorySyncAssistant */ #HistorySyncAssistant notebook { padding: 18px; } -#HistorySyncAssistant progressbar text { color: #000; font-size: 18px; padding: 10px;} +#HistorySyncAssistant progressbar text { color: #000; font-size: 1.6rem; padding: 10px;} #HistorySyncAssistant list { border: 1px solid; border-color: @borders; } #HistorySyncAssistant list > row { padding: 10px 30px 10px 30px; } #HistorySyncAssistant list > row > label { color: @insensitive_fg_color; } #HistorySyncAssistant list > row.activatable > label { color: @theme_text_color; } #HistorySyncAssistant list > row.activatable:selected > label { color: @theme_selected_fg_color; } -#FinishedLabel { font-size: 14px; font-weight: bold; } +#FinishedLabel { font-size: 1.2rem; font-weight: bold; } /* Server Info */ #ServerInfo { border: 1px solid; border-color: @borders; } @@ -546,7 +546,7 @@ window.settings-dialog list { } /* GenericSetting */ -#SubDescription { color: @insensitive_fg_color; font-size: small;} +#SubDescription { color: @insensitive_fg_color; font-size: 90%;} #GenericSettingBox { margin-left: 30px; } #GenericSettingBox > label { padding-right: 3px; } @@ -617,7 +617,7 @@ .accounts-settings stack > box { margin:30px; } .accounts-label-row { padding-top: 10px; padding-bottom: 10px; - font-size: 18px; + font-size: 1.6rem; font-weight: bold; color: @insensitive_fg_color;} @@ -742,9 +742,18 @@ .theme_popover_listbox row:focus { outline: none; } /* Text style */ .bold { font-weight: bold; } -.bold16 { font-size: 16px; font-weight: bold; } -.bold24 { font-size: 24px; font-weight: bold; } -.large-header { font-size: 20px; font-weight: bold; } +.bold16 { + font-size: 1.33rem; + font-weight: bold; +} +.bold24 { + font-size: 2.0rem; + font-weight: bold; +} +.large-header { + font-size: 1.75rem; + font-weight: bold; +} .insensitive-fg-color {color: @insensitive_fg_color;} /* Padding/Margins */ @@ -782,8 +791,8 @@ .unencrypted-color { color: @error_color; } .receipt-received-color { color: rgb(75, 181, 67); } /*Dataforms*/ -.field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} -.data-form-title { font-size: 16px; font-weight: bold; } +.field-fixed { font-size: 1.33rem; font-weight: bold; padding-top:5px;} +.data-form-title { font-size: 1.33rem; font-weight: bold; } .data-form-widget grid { margin: 0px 18px 18px 18px; } .data-form-widget treeview { padding: 5px; } .data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } ===================================== gajim/gtk/css_config.py ===================================== @@ -23,6 +23,7 @@ import math import logging from pathlib import Path +import sys from gi.repository import Gtk from gi.repository import Gdk @@ -115,12 +116,15 @@ def __init__(self) -> None: self._load_default() self._load_selected() self._activate_theme() - + Gtk.StyleContext.add_provider_for_screen( Gdk.Screen.get_default(), self._provider, CSSPriority.USER_THEME) + if sys.platform == 'win32': + self._apply_windows_font_size() + @property def prefer_dark(self) -> bool: setting = app.settings.get('dark_theme') @@ -185,6 +189,19 @@ def _activate_css(self, css: str, priority: CSSPriority) -> None: except Exception: log.exception('Error loading application css') + @staticmethod + def _apply_windows_font_size() -> None: + css = ''' + * { + font-size: 1.125rem; + } + ''' + provider = Gtk.CssProvider() + provider.load_from_data(bytes(css.encode('utf-8'))) + Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), + provider, + CSSPriority.PRE_APPLICATION) + @staticmethod def _pango_to_css_weight(number: int) -> int: # Pango allows for weight values between 100 and 1000 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d9ac569c221dca9ef8272837a516a10… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d9ac569c221dca9ef8272837a516a10… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: ChatControl: Remove dead encryption code
by Philipp Hörist (＠lovetox) 12 Aug '22

12 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c327dbfe by lovetox at 2022-08-12T23:48:21+02:00 refactor: ChatControl: Remove dead encryption code - - - - - d9ac569c by lovetox at 2022-08-13T00:03:04+02:00 imprv: ChatControl: Show error if encryption plugin is missing - - - - - 3 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/control.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -41,6 +41,7 @@ from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.structs import OutgoingMessage from gajim.common.types import ChatContactT +from gajim.gui.dialogs import ErrorDialog from .chat_banner import ChatBanner from .chat_function_page import ChatFunctionPage @@ -664,6 +665,11 @@ def _on_send_message(self) -> None: encryption = contact.settings.get('encryption') if encryption: + if encryption not in app.plugin_manager.encryption_plugins: + ErrorDialog(_('Encryption error'), + _('Missing necessary encryption plugin')) + return + self._chat_control.sendmessage = True app.plugin_manager.extension_point( 'send_message' + encryption, ===================================== gajim/gtk/control.py ===================================== @@ -99,8 +99,6 @@ def __init__(self) -> None: # XEP-0333 Chat Markers self.last_msg_id: Optional[str] = None - self.encryption: Optional[str] = None - self._subject_text_cache: dict[JID, str] = {} self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) @@ -147,7 +145,6 @@ def clear(self) -> None: self._contact = None self._client = None - self.encryption = None self.last_msg_id = None self.reset_view() self._scrolled_view.clear() @@ -172,8 +169,6 @@ def switch_contact(self, contact: Union[BareContact, self._groupchat_state.switch_contact(contact) self._roster.switch_contact(contact) - self.encryption = self.get_encryption_state() - self._register_events() if isinstance(contact, GroupchatParticipant): @@ -453,19 +448,6 @@ def mark_as_read(self, send_marker: bool = True) -> None: self.last_msg_id) self.last_msg_id = None - def set_encryption_state(self, encryption: Optional[str]) -> None: - self.encryption = encryption - self.contact.settings.set('encryption', self.encryption or '') - - def get_encryption_state(self) -> Optional[str]: - state = self.contact.settings.get('encryption') - if not state: - return None - if state not in app.plugin_manager.encryption_plugins: - self.set_encryption_state(None) - return None - return state - def _on_autoscroll_changed(self, _widget: ScrolledView, autoscroll: bool ===================================== gajim/gui_interface.py ===================================== @@ -326,10 +326,11 @@ def _on_file_dialog_ok(self, def _send_httpupload(self, chat_control: ChatControl, path: str) -> None: client = app.get_client(chat_control.contact.account) + encryption = chat_control.contact.settings.get('encryption') or None try: transfer = client.get_module('HTTPUpload').make_transfer( path, - chat_control.encryption, + encryption, chat_control.contact, chat_control.is_groupchat) except exceptions.FileError as error: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2ac83815d02a8f1a458c259807e8a6b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2ac83815d02a8f1a458c259807e8a6b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Use Path objects for gettext calls
by Philipp Hörist (＠lovetox) 12 Aug '22

12 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2ac83815 by lovetox at 2022-08-12T23:21:46+02:00 refactor: Use Path objects for gettext calls Seems python 3.9 does support this now - - - - - 2 changed files: - gajim/common/i18n.py - gajim/plugins/plugins_i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -54,7 +54,7 @@ def get_locale_dirs() -> Optional[list[Path]]: return [Path(dir_) for dir_ in data_dirs] -def iter_locale_dirs() -> Iterator[Optional[str]]: +def iter_locale_dirs() -> Iterator[Optional[Path]]: locale_dirs = get_locale_dirs() if locale_dirs is None: yield None @@ -70,7 +70,7 @@ def iter_locale_dirs() -> Iterator[Optional[str]]: continue found_paths.append(locale_dir) if locale_dir.is_dir(): - yield str(locale_dir) + yield locale_dir def get_win32_default_lang() -> str: ===================================== gajim/plugins/plugins_i18n.py ===================================== @@ -29,8 +29,7 @@ plugin_user_dir = Path.cwd() -# python 3.7 gettext module does not support Path objects -plugins_locale_dir = str(plugin_user_dir / 'locale') +plugins_locale_dir = plugin_user_dir / 'locale' try: t = gettext.translation(DOMAIN, plugins_locale_dir) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2ac83815d02a8f1a458c259807e8a6b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2ac83815d02a8f1a458c259807e8a6b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 12 Aug '22

12 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e0cb3e4a by lovetox at 2022-08-12T23:12:21+02:00 cq: Update pyrightconfig.json - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -3,8 +3,8 @@ "pythonVersion": "3.9", "typeCheckingMode": "strict", "reportImportCycles": "none", - "reportImplicitStringConcatenation": "none", "reportUnnecessaryTypeIgnoreComment": "error", + "reportPropertyTypeMismatch": "error", "reportMissingModuleSource": "none", "exclude": [ "**/__pycache__", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e0cb3e4aa46f0c7d015d17f19a127fd5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e0cb3e4aa46f0c7d015d17f19a127fd5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Remove not needed ignore comments
by Philipp Hörist (＠lovetox) 12 Aug '22

12 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8cf5511 by lovetox at 2022-08-12T23:00:23+02:00 cq: Remove not needed ignore comments - - - - - 5 changed files: - gajim/common/idle.py - gajim/gtk/certificate_dialog.py - gajim/gtk/groupchat_config.py - gajim/plugins/plugins_i18n.py - pyrightconfig.json Changes: ===================================== gajim/common/idle.py ===================================== @@ -233,7 +233,7 @@ class LastInputInfo(ctypes.Structure): ('dwTime', ctypes.c_uint) ] - self.lastInputInfo = LastInputInfo() # type: ignore + self.lastInputInfo = LastInputInfo() self.lastInputInfo.cbSize = ctypes.sizeof(self.lastInputInfo) def get_idle_sec(self) -> int: ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -92,10 +92,10 @@ def __init__(self, account: str, cert: Gio.TlsCertificate) -> None: expires = datetime.strptime(after.decode('ascii'), '%Y%m%d%H%M%SZ') self._expires = expires.strftime('%c %Z') - sha1 = certificate.digest('sha1').decode('utf-8') # type: ignore + sha1 = certificate.digest('sha1').decode('utf-8') self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) - sha256 = certificate.digest('sha256').decode('utf-8') # type: ignore + sha256 = certificate.digest('sha256').decode('utf-8') self._sha256 = '%s\n%s\n%s\n%s' % ( sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -96,7 +96,7 @@ def _on_config_received(self, task: Task) -> None: self._ui.stack.set_visible_child_name('config') def _on_apply(self, button: Gtk.Button) -> None: - form = self._data_form_widget.get_submit_form() # type: ignore + form = self._data_form_widget.get_submit_form() self._data_form_widget.set_sensitive(False) ===================================== gajim/plugins/plugins_i18n.py ===================================== @@ -39,4 +39,4 @@ _ = gettext.gettext if hasattr(locale, 'bindtextdomain'): - locale.bindtextdomain(DOMAIN, plugins_locale_dir) # type: ignore + locale.bindtextdomain(DOMAIN, plugins_locale_dir) ===================================== pyrightconfig.json ===================================== @@ -4,6 +4,7 @@ "typeCheckingMode": "strict", "reportImportCycles": "none", "reportImplicitStringConcatenation": "none", + "reportUnnecessaryTypeIgnoreComment": "error", "reportMissingModuleSource": "none", "exclude": [ "**/__pycache__", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8cf55114fce22d5bb8a98f3ff22f5bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8cf55114fce22d5bb8a98f3ff22f5bb… 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