Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] cfix: ChatBanner: Fix text for contacts
by Daniel Brötzmann (＠wurstsalat) 23 May '23

23 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 688639bf by wurstsalat at 2023-05-23T21:40:29+02:00 cfix: ChatBanner: Fix text for contacts - - - - - 1 changed file: - gajim/gtk/chat_banner.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -347,7 +347,7 @@ def _on_share_clicked(self, _button: Gtk.Button) -> None: if self._contact.is_groupchat: share_text = _('Scan this QR code to join %s.') else: - share_text = _('Scan this QR code to add %s to your contact list.') + share_text = _('Scan this QR code to start a chat with %s.') self._ui.share_instructions.set_text(share_text % self._contact.name) # Generate QR code on demand (i.e. not when switching chats) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/688639bf76087e72dc4073287a677917… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/688639bf76087e72dc4073287a677917… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ChatBanner: Add share instructions
by Daniel Brötzmann (＠wurstsalat) 23 May '23

23 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b8e51144 by wurstsalat at 2023-05-23T21:20:34+02:00 imprv: ChatBanner: Add share instructions - - - - - 3 changed files: - gajim/data/gui/chat_banner.ui - gajim/gtk/builder.pyi - gajim/gtk/chat_banner.py Changes: ===================================== gajim/data/gui/chat_banner.ui ===================================== @@ -10,6 +10,23 @@ <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="share_instructions"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">24</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkImage" id="qr_code_image"> <property name="visible">True</property> @@ -23,8 +40,18 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">0</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> @@ -74,7 +101,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <style> ===================================== gajim/gtk/builder.pyi ===================================== @@ -188,8 +188,9 @@ class CertificateBuilder(Builder): class ChatBannerBuilder(Builder): share_popover: Gtk.Popover - qr_code_image: Gtk.Image jid_label: Gtk.Label + share_instructions: Gtk.Label + qr_code_image: Gtk.Image banner_box: Gtk.Box avatar_image: Gtk.Image chat_menu_button: Gtk.MenuButton ===================================== gajim/gtk/chat_banner.py ===================================== @@ -343,6 +343,13 @@ def _get_share_uri(self) -> str: return self._client.get_module('OMEMO').compose_trust_uri(jid) def _on_share_clicked(self, _button: Gtk.Button) -> None: + assert self._contact is not None + if self._contact.is_groupchat: + share_text = _('Scan this QR code to join %s.') + else: + share_text = _('Scan this QR code to add %s to your contact list.') + self._ui.share_instructions.set_text(share_text % self._contact.name) + # Generate QR code on demand (i.e. not when switching chats) self._ui.qr_code_image.set_from_pixbuf( generate_qr_code(self._get_share_uri())) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8e51144fef2e96d67c0aa6f82246f16… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8e51144fef2e96d67c0aa6f82246f16… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatActionProcessor: De-duplicate emojis
by Philipp Hörist (＠lovetox) 23 May '23

23 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae08c961 by mjk at 2023-05-23T19:06:31+00:00 fix: ChatActionProcessor: De-duplicate emojis - - - - - 1 changed file: - gajim/gtk/chat_action_processor.py Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -18,6 +18,8 @@ from typing import cast from typing import Optional +import logging + from gi.repository import Gdk from gi.repository import Gio from gi.repository import GLib @@ -35,6 +37,8 @@ EMOJI_NUM_GENDERS = len(['f', 'm', 'n']) MENUS_MAX_ENTRIES = 2 * EMOJI_NUM_GENDERS +log = logging.getLogger('gajim.gtk.chat_action_processor') + class ChatActionProcessor(Gtk.Popover): def __init__(self, message_input: Gtk.TextView) -> None: @@ -249,21 +253,34 @@ def _update_emoji_menu(self, self._menu.remove_all() emoji_data = get_emoji_data() + sn_matches: dict[str, str] = {} + kw_matches: dict[str, str] = {} + for keyword, entries in emoji_data.items(): - for short_name in entries: - if not keyword.startswith(action_text): - continue - emoji = entries[short_name] + if not keyword.startswith(action_text): + continue + for short_name, emoji in entries.items(): label = f'{emoji} {short_name}' - if keyword != short_name: - label += f' [{keyword}]' - action_data = GLib.Variant('s', emoji) - menu_item = Gio.MenuItem() - menu_item.set_label(escape_mnemonic(label)) - menu_item.set_attribute_value('action-data', action_data) - self._menu.append_item(menu_item) - if self._menu.get_n_items() >= MENUS_MAX_ENTRIES: - break + if keyword == short_name: + # Replace a possible keyword match with the shortname match: + sn_matches[emoji] = label + if kw_matches.get(emoji) is not None: + del kw_matches[emoji] + else: + # Only add a keyword match if no shortname match: + if sn_matches.get(emoji) is None: + kw_matches[emoji] = f'{label} [{keyword}]' + + log.debug('Found %d "%s…" emoji by short name, %d more by keyword', + len(sn_matches), action_text, len(kw_matches)) + + # Put all shortname matches before keyword matches: + for emoji, label in list(sn_matches.items()) + list(kw_matches.items()): + action_data = GLib.Variant('s', emoji) + menu_item = Gio.MenuItem() + menu_item.set_label(escape_mnemonic(label)) + menu_item.set_attribute_value('action-data', action_data) + self._menu.append_item(menu_item) if self._menu.get_n_items() >= MENUS_MAX_ENTRIES: break View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae08c961da6b6b1866ae28c9d0983593… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae08c961da6b6b1866ae28c9d0983593… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Create contact cache per account
by Philipp Hörist (＠lovetox) 22 May '23

22 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8392372a by Philipp Hörist at 2023-05-23T00:34:23+02:00 refactor: Create contact cache per account - - - - - 6 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/common/modules/user_nickname.py - gajim/common/modules/vcard_avatars.py - gajim/common/storage/cache.py - gajim/gtk/avatar.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -360,7 +360,8 @@ def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: self.settings = ContactSettings(account, jid) self._resources: dict[str, ResourceContact] = {} - self._avatar_sha = app.storage.cache.get_contact(jid, 'avatar') + self._avatar_sha = app.storage.cache.get_contact( + account, jid, 'avatar') @property def is_self(self): @@ -448,7 +449,8 @@ def name(self) -> str: if item is not None and item.name: return item.name - nickname = app.storage.cache.get_contact(self._jid, 'nickname') + nickname = app.storage.cache.get_contact( + self._account, self._jid, 'nickname') if nickname: return nickname if self._jid.is_domain: @@ -466,7 +468,11 @@ def get_location(self) -> Optional[LocationData]: @property def avatar_sha(self) -> Optional[str]: - return app.storage.cache.get_contact(self._jid, 'avatar') + return app.storage.cache.get_contact( + self._account, self._jid, 'avatar') + + def set_avatar_sha(self, sha: str) -> None: + app.storage.cache.set_contact(self._account, self._jid, 'avatar', sha) def get_avatar(self, size: int, @@ -514,7 +520,7 @@ def update_avatar(self, sha: str) -> None: self._avatar_sha = sha - app.storage.cache.set_contact(self._jid, 'avatar', sha) + app.storage.cache.set_contact(self._account, self._jid, 'avatar', sha) app.app.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') @@ -743,7 +749,10 @@ def name(self) -> str: @property def avatar_sha(self) -> Optional[str]: - return app.storage.cache.get_muc(self._jid, 'avatar') + return app.storage.cache.get_muc(self._account, self._jid, 'avatar') + + def set_avatar_sha(self, sha: str) -> None: + app.storage.cache.set_muc(self._account, self._jid, 'avatar', sha) def get_avatar(self, size: int, scale: int) -> Optional[cairo.ImageSurface]: transport_icon = None ===================================== gajim/common/modules/discovery.py ===================================== @@ -235,7 +235,8 @@ def disco_muc(self, if not app.app.avatar_storage.avatar_exists(avatar_sha): app.app.avatar_storage.save_avatar(avatar) - app.storage.cache.set_muc(result.info.jid, 'avatar', avatar_sha) + app.storage.cache.set_muc( + self._account, result.info.jid, 'avatar', avatar_sha) app.app.avatar_storage.invalidate_cache(result.info.jid) self._con.get_module('VCardAvatars').muc_disco_info_update(result.info) ===================================== gajim/common/modules/user_nickname.py ===================================== @@ -55,7 +55,8 @@ def _nickname_received(self, app.nicks[self._account] = nick return - app.storage.cache.set_contact(properties.jid, 'nickname', nick) + app.storage.cache.set_contact( + self._account, properties.jid, 'nickname', nick) self._log.info('Nickname for %s: %s', properties.jid, nick) ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -97,11 +97,8 @@ def _request_vcard(self, self._log.info('Received: %s %s', contact.jid, avatar_sha) app.app.avatar_storage.save_avatar(avatar) - if isinstance(contact, BareContact): - app.storage.cache.set_contact(contact.jid, 'avatar', avatar_sha) - - elif isinstance(contact, GroupchatContact): - app.storage.cache.set_muc(contact.jid, 'avatar', avatar_sha) + if isinstance(contact, (BareContact, GroupchatContact)): + contact.set_avatar_sha(avatar_sha) else: self._muc_avatar_cache[contact.jid] = avatar_sha @@ -159,11 +156,7 @@ def _process_update(self, if state == AvatarState.EMPTY: # Empty <photo/> tag, means no avatar is advertised self._log.info('%s has no avatar published', jid) - if groupchat: - app.storage.cache.set_muc(jid, 'avatar', None) - else: - app.storage.cache.set_contact(jid, 'avatar', None) - + contact.set_avatar_sha(None) contact.update_avatar(avatar_sha) else: @@ -176,11 +169,7 @@ def _process_update(self, if app.app.avatar_storage.avatar_exists(avatar_sha): # Check if the avatar is already in storage self._log.info('Found avatar in storage') - if groupchat: - app.storage.cache.set_muc(jid, 'avatar', avatar_sha) - else: - app.storage.cache.set_contact(jid, 'avatar', avatar_sha) - + contact.set_avatar_sha(avatar_sha) contact.update_avatar(avatar_sha) return ===================================== gajim/common/storage/cache.py ===================================== @@ -35,7 +35,9 @@ from gajim.common.storage.base import SqliteStorage from gajim.common.storage.base import timeit -CURRENT_USER_VERSION = 9 +ContactCacheDictT = dict[tuple[str, JID], dict[str, Any]] + +CURRENT_USER_VERSION = 10 CACHE_SQL_STATEMENT = ''' CREATE TABLE caps_cache ( @@ -54,15 +56,19 @@ roster TEXT ); CREATE TABLE muc( - jid TEXT PRIMARY KEY UNIQUE, - avatar TEXT + account TEXT, + jid TEXT, + avatar TEXT, + PRIMARY KEY (account, jid) ); CREATE TABLE contact( - jid TEXT PRIMARY KEY UNIQUE, + account TEXT, + jid TEXT, avatar TEXT, avatar_ts INTEGER, nickname TEXT, - nickname_ts INTEGER + nickname_ts INTEGER, + PRIMARY KEY (account, jid) ); CREATE TABLE unread( account TEXT, @@ -101,8 +107,8 @@ def __init__(self, in_memory: bool = False): self._entity_caps_cache: dict[tuple[str, str], DiscoInfo] = {} self._disco_info_cache: dict[JID, DiscoInfo] = {} - self._muc_cache: dict[JID, dict[str, Any]] = defaultdict(dict) - self._contact_cache: dict[JID, dict[str, Any]] = defaultdict(dict) + self._muc_cache: ContactCacheDictT = defaultdict(dict) + self._contact_cache: ContactCacheDictT = defaultdict(dict) def init(self, **kwargs: Any) -> None: SqliteStorage.init(self, @@ -136,7 +142,7 @@ def _migrate(self) -> None: self._reinit_storage() return - if user_version < 9: + if user_version < 10: self._reinit_storage() return @@ -287,60 +293,74 @@ def remove_roster(self, account: str) -> None: self._commit() @timeit - def set_muc(self, jid: JID, prop: str, value: Any) -> None: - sql = f'''INSERT INTO muc (jid, {prop}) VALUES (?, ?)''' + def set_muc(self, + account: str, + jid: JID, + prop: str, + value: Any + ) -> None: + + sql = f'''INSERT INTO muc (account, jid, {prop}) VALUES (?, ?, ?)''' try: - self._con.execute(sql, (jid, value)) + self._con.execute(sql, (account, jid, value)) except sqlite3.IntegrityError: - sql = f'UPDATE muc SET {prop} = ? WHERE jid = ?' - self._con.execute(sql, (value, jid)) + sql = f'UPDATE muc SET {prop} = ? WHERE account = ? AND jid = ?' + self._con.execute(sql, (value, account, jid)) - self._muc_cache[jid][prop] = value + self._muc_cache[(account, jid)][prop] = value self._delayed_commit() @timeit - def get_muc(self, jid: JID, prop: str) -> Any: + def get_muc(self, account: str, jid: JID, prop: str) -> Any: try: - return self._muc_cache[jid][prop] + return self._muc_cache[(account, jid)][prop] except KeyError: sql = f'''SELECT jid as "jid [jid]", {prop} - FROM muc WHERE jid = ?''' - row = self._con.execute(sql, (jid,)).fetchone() + FROM muc WHERE account = ? AND jid = ?''' + row = self._con.execute(sql, (account, jid)).fetchone() value = None if row is None else getattr(row, prop) - self._muc_cache[jid][prop] = value + self._muc_cache[(account, jid)][prop] = value return value @timeit - def set_contact(self, jid: JID, prop: str, value: Any) -> None: - sql = f'INSERT INTO contact (jid, {prop}, {prop}_ts) VALUES (?, ?, ?)' + def set_contact(self, + account: str, + jid: JID, + prop: str, + value: Any + ) -> None: + + sql = f'''INSERT INTO contact (account, jid, {prop}, {prop}_ts) + VALUES (?, ?, ?, ?)''' prop_ts = time.time() try: - self._con.execute(sql, (jid, value, prop_ts)) + self._con.execute(sql, (account, jid, value, prop_ts)) except sqlite3.IntegrityError: - sql = f'UPDATE contact SET {prop} = ?, {prop}_ts = ? WHERE jid = ?' - self._con.execute(sql, (value, prop_ts, jid)) + sql = f'''UPDATE contact SET {prop} = ?, {prop}_ts = ? + WHERE account = ? AND jid = ?''' + self._con.execute(sql, (value, prop_ts, account, jid)) - self._contact_cache[jid][prop] = (value, prop_ts) + self._contact_cache[(account, jid)][prop] = (value, prop_ts) self._delayed_commit() @timeit - def get_contact(self, jid: JID, prop: str) -> Any: + def get_contact(self, account: str, jid: JID, prop: str) -> Any: try: - value, prop_ts = self._contact_cache[jid][prop] + value, prop_ts = self._contact_cache[(account, jid)][prop] except KeyError: sql = f'''SELECT jid as "jid [jid]", {prop}, {prop}_ts - FROM contact WHERE jid = ?''' - row = self._con.execute(sql, (jid,)).fetchone() + FROM contact WHERE account = ? AND jid = ?''' + row = self._con.execute(sql, (account, jid)).fetchone() value = None if row is None else getattr(row, prop) prop_ts = 0 if row is None else getattr(row, f'{prop}_ts') - self._contact_cache[jid][prop] = (value, prop_ts) + self._contact_cache[(account, jid)][prop] = (value, prop_ts) return value else: ===================================== gajim/gtk/avatar.py ===================================== @@ -432,7 +432,7 @@ def get_muc_surface(self, if surface is not None: return surface - avatar_sha = app.storage.cache.get_muc(jid, 'avatar') + avatar_sha = app.storage.cache.get_muc(account, jid, 'avatar') if avatar_sha is not None: surface = self.surface_from_filename(avatar_sha, size, scale) if surface is not None: @@ -442,7 +442,7 @@ def get_muc_surface(self, # avatar_sha set, but image is missing # (e.g. avatar cache deleted) - app.storage.cache.set_muc(jid, 'avatar', None) + app.storage.cache.set_muc(account, jid, 'avatar', None) client = app.get_client(account) contact = client.get_module('Contacts').get_bare_contact(jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8392372aafcd1166f799108e80ed39df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8392372aafcd1166f799108e80ed39df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch revert-e0a207a9
by Philipp Hörist (＠lovetox) 22 May '23

22 May '23

Philipp Hörist deleted branch revert-e0a207a9 at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Revert: Update avatar on muc-disco-update
by Philipp Hörist (＠lovetox) 22 May '23

22 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: d896101a by Philipp Hörist at 2023-05-22T20:47:54+00:00 cfix: Revert: Update avatar on muc-disco-update - - - - - 4 changed files: - gajim/gtk/chat_banner.py - gajim/gtk/chat_list_row.py - gajim/gtk/groupchat_details.py - gajim/gtk/groupchat_manage.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -221,7 +221,6 @@ def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: if event.jid != self._contact.jid: return - self._update_avatar() self._update_name_label() self._update_description_label() ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -30,11 +30,9 @@ from nbxmpp import JID from gajim.common import app -from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.const import RowHeaderType -from gajim.common.events import MucDiscoUpdate from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_groupchat_name @@ -135,8 +133,6 @@ def __init__(self, self.connect('drag-data-get', self._on_drag_data_get) if self.type == 'groupchat': - app.ged.register_event_handler( - 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) self._ui.group_chat_indicator.show() self.update_avatar() @@ -433,21 +429,12 @@ def _on_state_flags_changed(self, else: self._ui.revealer.set_reveal_child(False) - def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: - if event.jid != self.contact.jid: - return - - self.update_avatar() - def _on_destroy(self, _row: ChatListRow) -> None: app.settings.disconnect_signals(self) self.contact.disconnect_all_from_obj(self) if isinstance(self.contact, GroupchatParticipant): self.contact.room.disconnect_all_from_obj(self) - app.ged.remove_event_handler('muc-disco-update', - ged.GUI1, - self._on_muc_disco_update) app.check_finalize(self) def _on_close_button_clicked(self, _button: Gtk.Button) -> None: ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -114,8 +114,6 @@ def _on_client_state_changed(self, def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: if event.jid != self._contact.jid: return - - self._load_avatar() self._ui.name_entry.set_text(self._contact.name) disco_info = self._contact.get_disco() assert disco_info is not None ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -25,9 +25,7 @@ from nbxmpp.task import Task from gajim.common import app -from gajim.common import ged from gajim.common.const import AvatarSize -from gajim.common.events import MucDiscoUpdate from gajim.common.helpers import validate_jid from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact @@ -51,9 +49,6 @@ def __init__(self, self._contact = contact self._contact.connect('room-subject', self._on_room_subject) - app.ged.register_event_handler( - 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) - self._room_config_form = None self._ui = get_builder('groupchat_manage.ui') @@ -75,21 +70,12 @@ def __init__(self, def _on_destroy(self, *args: Any) -> None: del self._avatar_selector - app.ged.remove_event_handler('muc-disco-update', - ged.GUI1, - self._on_muc_disco_update) app.check_finalize(self) @property def disco_info(self): return app.storage.cache.get_last_disco_info(self._contact.jid) - def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: - if event.jid != self._contact.jid: - return - - self.update_avatar() - def _prepare_subject(self) -> None: text = '' if self._contact.subject is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d896101a22793dcaaeff4c3f3801bb7f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d896101a22793dcaaeff4c3f3801bb7f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][revert-e0a207a9] 2 commits: other: Update .githooks
by Philipp Hörist (＠lovetox) 22 May '23

22 May '23

Philipp Hörist pushed to branch revert-e0a207a9 at gajim / gajim Commits: a7075aa0 by Philipp Hörist at 2023-05-22T22:44:39+02:00 other: Update .githooks - - - - - 3267dd5c by Philipp Hörist at 2023-05-22T20:45:51+00:00 Revert "fix: UI: Update avatar on muc-disco-update" This reverts commit e0a207a9b89b15815a054870b3d2816e1b2d0e86 - - - - - 5 changed files: - .githooks/update - gajim/gtk/chat_banner.py - gajim/gtk/chat_list_row.py - gajim/gtk/groupchat_details.py - gajim/gtk/groupchat_manage.py Changes: ===================================== .githooks/update ===================================== @@ -22,6 +22,7 @@ ALLOWED_TAGS = [ 'release', 'other', 'imprv', + 'revert', ] ===================================== gajim/gtk/chat_banner.py ===================================== @@ -221,7 +221,6 @@ def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: if event.jid != self._contact.jid: return - self._update_avatar() self._update_name_label() self._update_description_label() ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -30,11 +30,9 @@ from nbxmpp import JID from gajim.common import app -from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.const import RowHeaderType -from gajim.common.events import MucDiscoUpdate from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_groupchat_name @@ -135,8 +133,6 @@ def __init__(self, self.connect('drag-data-get', self._on_drag_data_get) if self.type == 'groupchat': - app.ged.register_event_handler( - 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) self._ui.group_chat_indicator.show() self.update_avatar() @@ -433,21 +429,12 @@ def _on_state_flags_changed(self, else: self._ui.revealer.set_reveal_child(False) - def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: - if event.jid != self.contact.jid: - return - - self.update_avatar() - def _on_destroy(self, _row: ChatListRow) -> None: app.settings.disconnect_signals(self) self.contact.disconnect_all_from_obj(self) if isinstance(self.contact, GroupchatParticipant): self.contact.room.disconnect_all_from_obj(self) - app.ged.remove_event_handler('muc-disco-update', - ged.GUI1, - self._on_muc_disco_update) app.check_finalize(self) def _on_close_button_clicked(self, _button: Gtk.Button) -> None: ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -114,8 +114,6 @@ def _on_client_state_changed(self, def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: if event.jid != self._contact.jid: return - - self._load_avatar() self._ui.name_entry.set_text(self._contact.name) disco_info = self._contact.get_disco() assert disco_info is not None ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -25,9 +25,7 @@ from nbxmpp.task import Task from gajim.common import app -from gajim.common import ged from gajim.common.const import AvatarSize -from gajim.common.events import MucDiscoUpdate from gajim.common.helpers import validate_jid from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact @@ -51,9 +49,6 @@ def __init__(self, self._contact = contact self._contact.connect('room-subject', self._on_room_subject) - app.ged.register_event_handler( - 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) - self._room_config_form = None self._ui = get_builder('groupchat_manage.ui') @@ -75,21 +70,12 @@ def __init__(self, def _on_destroy(self, *args: Any) -> None: del self._avatar_selector - app.ged.remove_event_handler('muc-disco-update', - ged.GUI1, - self._on_muc_disco_update) app.check_finalize(self) @property def disco_info(self): return app.storage.cache.get_last_disco_info(self._contact.jid) - def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: - if event.jid != self._contact.jid: - return - - self.update_avatar() - def _prepare_subject(self) -> None: text = '' if self._contact.subject is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/827c53b02499fdf0bd75673ff6fad50… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/827c53b02499fdf0bd75673ff6fad50… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Update .githooks
by Philipp Hörist (＠lovetox) 22 May '23

22 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: a7075aa0 by Philipp Hörist at 2023-05-22T22:44:39+02:00 other: Update .githooks - - - - - 1 changed file: - .githooks/update Changes: ===================================== .githooks/update ===================================== @@ -22,6 +22,7 @@ ALLOWED_TAGS = [ 'release', 'other', 'imprv', + 'revert', ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a7075aa0fe098adcefac0bc40dfc6440… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a7075aa0fe098adcefac0bc40dfc6440… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch revert-e0a207a9
by Philipp Hörist (＠lovetox) 22 May '23

22 May '23

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

1 0

[Git][gajim/gajim][master] fix: Fix encryption deadlock with changed MUC configurations
by Daniel Brötzmann (＠wurstsalat) 22 May '23

22 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e73d1334 by wurstsalat at 2023-05-22T22:09:58+02:00 fix: Fix encryption deadlock with changed MUC configurations This disables encryption if MUC configuration changed and encryption is not applicable anymore Fixes #11421 - - - - - 1 changed file: - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -318,6 +318,12 @@ def _update_encryption_button(self) -> None: 'Encryption is not available.') icon_name = 'channel-insecure-symbolic' + # Disable encryption if chat was encrypted before, but due to + # changed circumstances, encryption is not applicable anymore + # (i.e. group chat configuration changed). + contact.settings.set('encryption', '') + action.set_state(GLib.Variant('s', '')) + self._ui.encryption_menu_button.set_sensitive(sensitive) self._ui.encryption_menu_button.set_tooltip_text(tooltip) self._ui.encryption_image.set_from_icon_name( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e73d13344232457f0fad3cc09a46940b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e73d13344232457f0fad3cc09a46940b… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
1764
Older →

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