Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: chore: GroupchatInviter: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 14 Jun '22

14 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 946a4ef6 by wurstsalat at 2022-06-14T09:20:31+02:00 chore: GroupchatInviter: Add type annotations - - - - - 3ee74934 by wurstsalat at 2022-06-14T09:42:50+02:00 imprv: CreateGroupchatWindow: Produce valid addresses from name - - - - - 2 changed files: - gajim/gtk/groupchat_creation.py - gajim/gtk/groupchat_inviter.py Changes: ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -208,6 +208,7 @@ def _on_name_entry_changed(self, entry: Gtk.Entry) -> None: return name = entry.get_text() + name = name.replace(' ', '-') server = self._get_muc_service_jid() self._ui.address_entry.set_text(f'{name.lower()}@{server}') ===================================== gajim/gtk/groupchat_inviter.py ===================================== @@ -14,12 +14,13 @@ from __future__ import annotations -from typing import List +from typing import Any from typing import Optional import locale -from gi.repository import Gdk, GdkPixbuf +from gi.repository import Gdk +from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import GObject from gi.repository import Gtk @@ -342,7 +343,7 @@ def _scroll_to_first_row(self) -> None: def _filter_func(self, row: ContactRow, - _user_data: Optional[object] + _user_data: Optional[Any] ) -> bool: search_text = self._ui.search_entry.get_text().lower() search_text_list = search_text.split() @@ -357,7 +358,7 @@ def _filter_func(self, @staticmethod def _sort_func(row1: ContactRow, row2: ContactRow, - _user_data: Optional[object] + _user_data: Optional[Any] ) -> int: name1 = row1.get_search_text() name2 = row2.get_search_text() @@ -394,5 +395,5 @@ def load_contacts(self) -> None: def focus_search_entry(self) -> None: self._ui.search_entry.grab_focus() - def get_invitees(self) -> List[str]: + def get_invitees(self) -> list[str]: return self._invitees_box.get_contact_jids() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/33bbbe38eb781562f5d378e437d30aa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/33bbbe38eb781562f5d378e437d30aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Flatpak: Determine notification backend caps with dbus
by Philipp Hörist (＠lovetox) 13 Jun '22

13 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 33bbbe38 by lovetox at 2022-06-13T22:37:23+02:00 fix: Flatpak: Determine notification backend caps with dbus - - - - - 3 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/gtk/notification.py Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -24,6 +24,8 @@ finish-args: # Keyring - --talk-name=org.freedesktop.secrets - --talk-name=org.kde.kwalletd5 + # Notifications + - --talk-name=org.freedesktop.Notifications # GnuPG - --filesystem=~/.gnupg # camera access ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -17,6 +17,8 @@ finish-args: # Keyring - --talk-name=org.freedesktop.secrets - --talk-name=org.kde.kwalletd5 + # Notifications + - --talk-name=org.freedesktop.Notifications # GnuPG - --filesystem=~/.gnupg # camera access ===================================== gajim/gtk/notification.py ===================================== @@ -279,7 +279,7 @@ def __init__(self): log.info('Detected notification capabilities: %s', self._caps) def _detect_dbus_caps(self) -> None: - if app.is_flatpak() or app.desktop_env == 'gnome': + if app.desktop_env == 'gnome': # Gnome Desktop does not use org.freedesktop.Notifications. # It has its own API at org.gtk.Notifications, which is not an # implementation of the freedesktop spec. There is no documentation View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/33bbbe38eb781562f5d378e437d30aa8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/33bbbe38eb781562f5d378e437d30aa8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Groupchat: Load GroupChatState widget early
by Daniel Brötzmann (＠wurstsalat) 13 Jun '22

13 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3c6c0b14 by wurstsalat at 2022-06-13T21:02:47+02:00 fix: Groupchat: Load GroupChatState widget early Fixes #10913 - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -121,6 +121,13 @@ def __init__(self, account: str, jid: JID) -> None: self.correcting: bool = False self.last_sent_msg: Optional[str] = None + self._groupchat_state = GroupchatState() + self._groupchat_state.connect('join-clicked', + self._on_groupchat_state_join_clicked) + self._groupchat_state.connect('abort-clicked', + self._on_groupchat_state_abort_clicked) + self.xml.conv_view_overlay.add_overlay(self._groupchat_state) + self.roster = GroupchatRoster(self.account, self.room_jid, self) self.xml.roster_revealer.add(self.roster) @@ -138,7 +145,6 @@ def __init__(self, account: str, jid: JID) -> None: self.add_actions() GLib.idle_add(self.update_actions) - self.scale_factor = app.window.get_scale_factor() if not app.settings.get('hide_groupchat_banner'): self.xml.banner_eventbox.set_no_show_all(False) @@ -196,13 +202,6 @@ def __init__(self, account: str, jid: JID) -> None: self._set_control_inactive() - self._groupchat_state = GroupchatState() - self._groupchat_state.connect('join-clicked', - self._on_groupchat_state_join_clicked) - self._groupchat_state.connect('abort-clicked', - self._on_groupchat_state_abort_clicked) - self.xml.conv_view_overlay.add_overlay(self._groupchat_state) - # Stack self.xml.stack.show_all() self.xml.stack.set_visible_child_name('groupchat') @@ -565,7 +564,8 @@ def _on_avatar_update(self, self._update_avatar() def _update_avatar(self) -> None: - surface = self.contact.get_avatar(AvatarSize.CHAT, self.scale_factor) + surface = self.contact.get_avatar( + AvatarSize.CHAT, app.window.get_scale_factor()) self.xml.avatar_image.set_from_surface(surface) def draw_banner_text(self) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c6c0b1421f1c34b4bd7a84f620448c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c6c0b1421f1c34b4bd7a84f620448c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Groupchat: don't steal active msg textbox focus
by Daniel Brötzmann (＠wurstsalat) 13 Jun '22

13 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 72d46785 by Dexter Gaon-Shatford at 2022-06-12T21:54:47+00:00 fix: Groupchat: don't steal active msg textbox focus fixes #10900 - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -374,7 +374,9 @@ def _show_page(self, name: str) -> None: transition = Gtk.StackTransitionType.SLIDE_DOWN if name == 'groupchat': transition = Gtk.StackTransitionType.SLIDE_UP - self.msg_textview.grab_focus() + active_control = app.window.get_active_control() + if active_control == self: + self.msg_textview.grab_focus() self.xml.stack.set_visible_child_full(name, transition) def _get_current_page(self) -> str: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72d467850a4a515e5010115d92dd4467… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72d467850a4a515e5010115d92dd4467… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Make drag & drop more reliable
by Philipp Hörist (＠lovetox) 12 Jun '22

12 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2cf121e4 by lovetox at 2022-06-12T23:19:48+02:00 fix: Make drag & drop more reliable Use pickle to pass data as a tuple instead of depending on string.split() Fixes #10978 - - - - - 2 changed files: - gajim/gtk/chat_list.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -21,6 +21,7 @@ import logging import time +import pickle from gi.repository import Gio from gi.repository import Gdk @@ -737,8 +738,8 @@ def _on_drag_data_get(self, _time: int ) -> None: drop_type = Gdk.Atom.intern_static_string('CHAT_LIST_ITEM') - data = f'{self.account} {self.jid}'.encode('utf-8') - selection_data.set(drop_type, 32, data) + byte_data = pickle.dumps((self.account, self.jid)) + selection_data.set(drop_type, 8, byte_data) def toggle_pinned(self) -> None: self._pinned = not self._pinned ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -20,12 +20,12 @@ from typing import cast import logging +import pickle from gi.repository import Gdk from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk - from nbxmpp.protocol import JID from gajim.common import app @@ -117,12 +117,13 @@ def _on_drag_data_received(self, _info: int, _time: int ) -> None: - data = selection_data.get_data().decode('utf-8') + data = selection_data.get_data() item_type = selection_data.get_data_type().name() if item_type == 'WORKSPACE_SIDEBAR_ITEM': - self._process_workspace_drop(data) + self._process_workspace_drop(data.decode('utf-8')) elif item_type == 'CHAT_LIST_ITEM': - self._process_chat_list_drop(data, y_coord) + account, jid = pickle.loads(data) + self._process_chat_list_drop(account, jid, y_coord) else: log.debug('Unknown item type dropped') @@ -147,9 +148,11 @@ def _process_workspace_drop(self, workspace_id: str) -> None: self.store_workspace_order() app.window.activate_workspace(workspace_id) - def _process_chat_list_drop(self, identifier: str, y_coord: int) -> None: - account, jid = identifier.split() - jid = JID.from_string(jid) + def _process_chat_list_drop(self, + account: str, + jid: JID, + y_coord: int) -> None: + workspace_row = cast(Workspace, self.get_row_at_y(y_coord)) if workspace_row.workspace_id == 'add': app.window.move_chat_to_new_workspace( @@ -377,7 +380,7 @@ def _on_drag_data_get(self, ) -> None: drop_type = Gdk.Atom.intern_static_string('WORKSPACE_SIDEBAR_ITEM') data = self.workspace_id.encode('utf-8') - selection_data.set(drop_type, 32, data) + selection_data.set(drop_type, 8, data) class AddWorkspace(CommonWorkspace): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2cf121e4e3f84171f294d217bd8b6f8b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2cf121e4e3f84171f294d217bd8b6f8b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Application: Handle cmdline options only on startup
by Philipp Hörist (＠lovetox) 12 Jun '22

12 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0a0a583e by lovetox at 2022-06-12T21:35:35+02:00 refactor: Application: Handle cmdline options only on startup Call startup() from the `handle-local-options` handler. This allows us to register() the application ourself and see if we are a remote instance. Then parse and handle startup related cmdline options, only if we are not a remote instance. - - - - - 774d32b0 by lovetox at 2022-06-12T21:35:35+02:00 feat: Add new command --show - - - - - 3 changed files: - gajim/common/application.py - gajim/gtk/application.py - gajim/gtk/const.py Changes: ===================================== gajim/common/application.py ===================================== @@ -35,6 +35,7 @@ from gajim.common import app from gajim.common import ged from gajim.common import configpaths +from gajim.common import logging_helpers from gajim.common.events import AccountDisonnected from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable @@ -94,6 +95,38 @@ def _init_core(self) -> None: def _log(self) -> logging.Logger: return app.log('gajim.application') + def _core_command_line(self, options: GLib.VariantDict) -> None: + if options.contains('cprofile'): + self.start_profiling() + + if options.contains('gdebug'): + os.environ['G_MESSAGES_DEBUG'] = 'all' + + if options.contains('separate'): + configpaths.set_separation(True) + + config_path = options.lookup_value('config-path') + if config_path is not None: + config_path = config_path.get_string() + configpaths.set_config_root(config_path) + + configpaths.init() + logging_helpers.init() + + if options.contains('quiet'): + logging_helpers.set_quiet() + + if options.contains('verbose'): + logging_helpers.set_verbose() + + loglevel = options.lookup_value('loglevel') + if loglevel is not None: + loglevel = loglevel.get_string() + logging_helpers.set_loglevels(loglevel) + + if options.contains('warnings'): + self._show_warnings() + def start_profiling(self) -> None: self._log.info('Start profiling') self._profiling_session = cProfile.Profile() ===================================== gajim/gtk/application.py ===================================== @@ -58,7 +58,6 @@ from gajim.common import events from gajim.common import ged from gajim.common import idle -from gajim.common import logging_helpers from gajim.common.application import CoreApplication from gajim.common.const import GAJIM_FAQ_URI from gajim.common.const import GAJIM_WIKI_URI @@ -194,11 +193,16 @@ def __init__(self): GLib.OptionArg.NONE, _('Start a new chat')) + self.add_main_option( + 'show', 0, + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show Gajim')) + self.add_main_option_entries(self._get_remaining_entry()) self.connect('handle-local-options', self._handle_local_options) self.connect('command-line', self._command_line) - self.connect('startup', self._startup) self.connect('shutdown', self._shutdown) self.interface = None @@ -218,7 +222,7 @@ def _get_remaining_entry(): option.short_name = 0 return [option] - def _startup(self, _application: GajimApplication) -> None: + def _startup(self) -> None: if sys.platform == 'win32': # Changing the PANGOCAIRO_BACKEND is necessary on Windows # to render colored emoji glyphs @@ -335,11 +339,15 @@ def _quit_app(self) -> None: def _command_line(self, _application: GajimApplication, command_line: Gio.ApplicationCommandLine) -> int: + '''Handles command line options not related to the startup of Gajim. + ''' + options = command_line.get_options_dict() remote_commands = [ ('ipython', None), ('start-chat', GLib.Variant('s', '')), + ('show', None) ] remaining = options.lookup_value(GLib.OPTION_REMAINING, @@ -359,14 +367,11 @@ def _command_line(self, def _handle_local_options(self, _application: Gtk.Application, options: GLib.VariantDict) -> int: - # Parse all options that have to be executed before ::startup + if options.contains('version'): print(gajim.__version__) return 0 - if options.contains('cprofile'): - self.start_profiling() - profile = options.lookup_value('profile') if profile is not None: # Incorporate profile name into application id @@ -376,35 +381,12 @@ def _handle_local_options(self, self.set_application_id(app_id) configpaths.set_profile(profile) - if options.contains('separate'): - configpaths.set_separation(True) - - config_path = options.lookup_value('config-path') - if config_path is not None: - config_path = config_path.get_string() - configpaths.set_config_root(config_path) - - configpaths.init() - - if options.contains('gdebug'): - os.environ['G_MESSAGES_DEBUG'] = 'all' - - logging_helpers.init() - - if options.contains('quiet'): - logging_helpers.set_quiet() - - if options.contains('verbose'): - logging_helpers.set_verbose() - - loglevel = options.lookup_value('loglevel') - if loglevel is not None: - loglevel = loglevel.get_string() - logging_helpers.set_loglevels(loglevel) - - if options.contains('warnings'): - self._show_warnings() + self.register() + if self.get_is_remote(): + return -1 + self._core_command_line(options) + self._startup() return -1 def _add_app_actions(self) -> None: @@ -444,6 +426,7 @@ def _connect_app_actions(self) -> None: ('create-groupchat', self._on_create_groupchat_action), ('forget-groupchat', self._on_forget_groupchat_action), ('groupchat-join', self._on_groupchat_join_action), + ('show', self._on_show), ] for action in actions: @@ -837,3 +820,7 @@ def _on_groupchat_join_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: account, jid = param.get_strv() open_window('GroupchatJoin', account=account, jid=jid) + + @staticmethod + def _on_show(_action: Gio.SimpleAction, param: GLib.Variant) -> None: + app.window.show() ===================================== gajim/gtk/const.py ===================================== @@ -181,6 +181,7 @@ def __str__(self): ('quit', None), ('remove-history', 'a{sv}'), ('shortcuts', None), + ('show', None), ('start-chat', 's'), ('xml-console', None), ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/dcf7c1a317ef801d8139639bddaa289… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/dcf7c1a317ef801d8139639bddaa289… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Groupchat: Show correct icon when toggling roster revealer
by Philipp Hörist (＠lovetox) 12 Jun '22

12 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: dcf7c1a3 by Dexter Gaon-Shatford at 2022-06-12T19:24:12+00:00 fix: Groupchat: Show correct icon when toggling roster revealer Fixes #10944 - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -126,14 +126,14 @@ def __init__(self, account: str, jid: JID) -> None: show_roster = app.settings.get('hide_groupchat_occupants_list') self.xml.roster_revealer.set_reveal_child(show_roster) - icon = 'go-next-symbolic' if show_roster else 'go-previous-symbolic' - self.xml.toggle_roster_image.set_from_icon_name( - icon, Gtk.IconSize.BUTTON) - app.settings.bind_signal( 'hide_groupchat_occupants_list', self.xml.roster_revealer, 'set_reveal_child') + self._set_toggle_roster_button_icon(show_roster) + app.settings.connect_signal( + 'hide_groupchat_occupants_list', + self._set_toggle_roster_button_icon) self.roster.connect('row-activated', self._on_roster_row_activated) self.add_actions() @@ -522,12 +522,17 @@ def _on_change_affiliation(self, self.room_jid, {jid: {'affiliation': affiliation}}) - def _show_roster(self, *args: Any) -> None: - show = not self.xml.roster_revealer.get_reveal_child() - icon = 'go-next-symbolic' if show else 'go-previous-symbolic' + def _set_toggle_roster_button_icon(self, + show_roster: bool, + *args: Any) -> None: + icon = 'go-next-symbolic' if show_roster else 'go-previous-symbolic' self.xml.toggle_roster_image.set_from_icon_name( icon, Gtk.IconSize.BUTTON) + def _show_roster(self, *args: Any) -> None: + show = not self.xml.roster_revealer.get_reveal_child() + self._set_toggle_roster_button_icon(show) + transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if show: transition = Gtk.RevealerTransitionType.SLIDE_LEFT View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dcf7c1a317ef801d8139639bddaa2892… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dcf7c1a317ef801d8139639bddaa2892… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: StatusMessageSelector: Enable emoji completion
by Daniel Brötzmann (＠wurstsalat) 12 Jun '22

12 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 580cfc9e by wurstsalat at 2022-06-12T21:17:45+02:00 imprv: StatusMessageSelector: Enable emoji completion - - - - - 197298f1 by wurstsalat at 2022-06-12T21:18:20+02:00 imprv: CreateGroupchatWindow: Enable emoji completion for description - - - - - 2 changed files: - gajim/data/gui/groupchat_creation.ui - gajim/gtk/status_message_selector.py Changes: ===================================== gajim/data/gui/groupchat_creation.ui ===================================== @@ -97,6 +97,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="show-emoji-icon">True</property> + <property name="enable-emoji-completion">True</property> </object> <packing> <property name="left-attach">1</property> ===================================== gajim/gtk/status_message_selector.py ===================================== @@ -41,6 +41,7 @@ def __init__(self, account: Optional[str] = None) -> None: self._entry = Gtk.Entry() self._entry.set_size_request(200, -1) self._entry.set_property('show-emoji-icon', True) + self._entry.set_property('enable-emoji-completion', True) self._entry.set_placeholder_text(_('Status message…')) self._entry.connect('activate', self._set_status_message) self._entry.connect('changed', self._on_changed) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/17ae6e75b4fb7785377c31774d44922… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/17ae6e75b4fb7785377c31774d44922… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Chat banner: Show phone image if last message came from a phone
by Daniel Brötzmann (＠wurstsalat) 12 Jun '22

12 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 17ae6e75 by wurstsalat at 2022-06-12T14:24:36+02:00 fix: Chat banner: Show phone image if last message came from a phone - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/gtk/controls/chat.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -492,6 +492,17 @@ def identity_type(self) -> Optional[str]: return None + @property + def is_phone(self): + disco_info = app.storage.cache.get_last_disco_info(self._jid) + if disco_info is None: + return False + + for identity in disco_info.identities: + if identity.type == 'phone': + return True + return False + @property def is_available(self) -> bool: return self._presence.available ===================================== gajim/gtk/controls/chat.py ===================================== @@ -323,13 +323,6 @@ def _on_send_marker(self, def _on_nickname_received(self, _event): self.update_ui() - def _on_update_client_info(self, event): - # TODO: Test if this works - contact = self._client.get_module('Contacts').get_contact(event.jid) - if contact is None: - return - self.xml.phone_image.set_visible(contact.uses_phone) - def _on_chatstate_update(self, _contact: types.BareContact, _signal_name: str @@ -382,6 +375,9 @@ def _on_message_received(self, event: events.MessageReceived) -> None: if event.properties.is_sent_carbon: kind = 'outgoing' + resource_contact = self.contact.get_resource(event.resource) + self.xml.phone_image.set_visible(resource_contact.is_phone) + self.add_message(event.msgtxt, kind, tim=event.properties.timestamp, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17ae6e75b4fb7785377c31774d449220… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17ae6e75b4fb7785377c31774d449220… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Groupchat: Prevent automatic roster revealer toggling on join
by Daniel Brötzmann (＠wurstsalat) 12 Jun '22

12 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ffca46fc by wurstsalat at 2022-06-12T13:43:02+02:00 fix: Groupchat: Prevent automatic roster revealer toggling on join - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -123,8 +123,13 @@ def __init__(self, account: str, jid: JID) -> None: self.roster = GroupchatRoster(self.account, self.room_jid, self) self.xml.roster_revealer.add(self.roster) - self.xml.roster_revealer.set_reveal_child( - not app.settings.get('hide_groupchat_occupants_list')) + + show_roster = app.settings.get('hide_groupchat_occupants_list') + self.xml.roster_revealer.set_reveal_child(show_roster) + icon = 'go-next-symbolic' if show_roster else 'go-previous-symbolic' + self.xml.toggle_roster_image.set_from_icon_name( + icon, Gtk.IconSize.BUTTON) + app.settings.bind_signal( 'hide_groupchat_occupants_list', self.xml.roster_revealer, @@ -244,7 +249,6 @@ def _on_muc_state_changed(self, if self.contact.is_joined: self._set_control_active() - self._show_roster() self._groupchat_state.set_joined() elif self.contact.is_not_joined: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ffca46fce4aaa25a9bd6a8a00546f469… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ffca46fce4aaa25a9bd6a8a00546f469… 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