Commits November 2020

commits@gajim.org

1 participants
43 discussions

[Git][gajim/gajim][master] Fix spelling errors
by Philipp Hörist 23 Nov '20

23 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1fa2c4b5 by lovetox at 2020-11-23T19:08:50+01:00 Fix spelling errors - - - - - 2 changed files: - codespell.conf - gajim/dialogs.py Changes: ===================================== codespell.conf ===================================== @@ -6,3 +6,4 @@ tim transfered wanna wth +trough ===================================== gajim/dialogs.py ===================================== @@ -351,7 +351,7 @@ class TransformChatToMUC: instances = [] # type: List[TransformChatToMUC] def __init__(self, account, jids, preselected=None): """ - This window is used to trasform a one-to-one chat to a MUC. We do 2 + This window is used to transform a one-to-one chat to a MUC. We do 2 things: first select the server and then make a guests list """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1fa2c4b54bc4f4582041221d9386cd59… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1fa2c4b54bc4f4582041221d9386cd59… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DataForm: Fix ListMutliTreeView regression
by Philipp Hörist 23 Nov '20

23 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17621919 by lovetox at 2020-11-23T18:53:18+01:00 DataForm: Fix ListMutliTreeView regression Fixes #10354 - - - - - 1 changed file: - gajim/gtk/dataform.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -426,17 +426,17 @@ def __init__(self, field, multi_field): def _toggled(self, _renderer, path): iter_ = self._store.get_iter(path) - current_value = self._store[iter_][2] - self._store.set_value(iter_, 2, not current_value) + current_value = self._store[iter_][3] + self._store.set_value(iter_, 3, not current_value) self._set_values() self._multi_field.validate() def _set_values(self): values = [] for row in self.get_model(): - if not row[2]: + if not row[3]: continue - values.append(row[1]) + values.append(row[2]) self._field.values = values View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17621919acfdf29a8fd583316a2b9672… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17621919acfdf29a8fd583316a2b9672… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: Fix scroll hotkey infinite recursion
by Philipp Hörist 23 Nov '20

23 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 305731ca by lovetox at 2020-11-23T14:37:51+01:00 ChatControlBase: Fix scroll hotkey infinite recursion Handling of SHIFT + PAGE_UP/PAGE_DOWN was missing in the ConversationTextview key press handler - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -269,6 +269,10 @@ def __init__(self, parent_win, widget_name, contact, acct, CommandTools.__init__(self) def _on_conv_textview_key_press_event(self, textview, event): + if event.get_state() & Gdk.ModifierType.SHIFT_MASK: + if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): + return Gdk.EVENT_PROPAGATE + if event.keyval in COPY_MODIFIER_KEYS: # Don’t route modifier keys for copy action to the Message Input # otherwise pressing CTRL/META + c (the next event after that) @@ -844,20 +848,20 @@ def _on_message_textview_key_press_event(self, textview, event): if self._type.is_groupchat: if event.keyval not in (Gdk.KEY_ISO_Left_Tab, Gdk.KEY_Tab): self.last_key_tabs = False + if event.get_state() & Gdk.ModifierType.SHIFT_MASK: - # CTRL + SHIFT + TAB if event.get_state() & Gdk.ModifierType.CONTROL_MASK and \ event.keyval == Gdk.KEY_ISO_Left_Tab: self.parent_win.move_to_next_unread_tab(False) return True - # SHIFT + PAGE_[UP|DOWN]: send to conv_textview - if event.keyval == Gdk.KEY_Page_Down or \ - event.keyval == Gdk.KEY_Page_Up: + + if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): self.conv_textview.tv.event(event) self._on_scroll(None, event.keyval) return True + if event.get_state() & Gdk.ModifierType.CONTROL_MASK: - if event.keyval == Gdk.KEY_Tab: # CTRL + TAB + if event.keyval == Gdk.KEY_Tab: self.parent_win.move_to_next_unread_tab(True) return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/305731ca69310f0a85b66cdfa71997f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/305731ca69310f0a85b66cdfa71997f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AdHoc: Show default action
by Philipp Hörist 22 Nov '20

22 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 028a2abf by lovetox at 2020-11-22T22:58:25+01:00 AdHoc: Show default action - - - - - 1 changed file: - gajim/gtk/adhoc.py Changes: ===================================== gajim/gtk/adhoc.py ===================================== @@ -83,14 +83,12 @@ def _add_custom_buttons(self): for button in list(action_area.get_children()): self.remove_action_widget(button) - cancel = Gtk.Button(label=_('Cancel')) + cancel = ActionButton(_('Cancel'), AdHocAction.CANCEL) cancel.connect('clicked', self._abort) - cancel.get_style_context().add_class('destructive-action') self._buttons['cancel'] = cancel self.add_action_widget(cancel) - complete = Gtk.Button(label=_('Finish')) - complete.action = AdHocAction.COMPLETE + complete = ActionButton(_('Finish'), AdHocAction.COMPLETE) complete.connect('clicked', self._execute_action) self._buttons['complete'] = complete self.add_action_widget(complete) @@ -101,28 +99,26 @@ def _add_custom_buttons(self): self._buttons['commands'] = commands self.add_action_widget(commands) - next_ = Gtk.Button(label=_('Next')) - next_.action = AdHocAction.NEXT + next_ = ActionButton(_('Next'), AdHocAction.NEXT) next_.connect('clicked', self._execute_action) self._buttons['next'] = next_ self.add_action_widget(next_) - prev = Gtk.Button(label=_('Previous')) - prev.action = AdHocAction.PREV + prev = ActionButton(_('Previous'), AdHocAction.PREV) prev.connect('clicked', self._execute_action) self._buttons['prev'] = prev self.add_action_widget(prev) - execute = Gtk.Button(label=_('Execute')) - execute.action = AdHocAction.EXECUTE - execute.get_style_context().add_class('suggested-action') + execute = ActionButton(_('Execute'), AdHocAction.EXECUTE) execute.connect('clicked', self._execute_action) self._buttons['execute'] = execute self.add_action_widget(execute) def _set_button_visibility(self, page): - for button in self._buttons.values(): + for action, button in self._buttons.items(): button.hide() + if action in ('next', 'prev', 'complete'): + button.remove_default() if page == Page.COMMANDS: self._buttons['execute'].show() @@ -132,10 +128,13 @@ def _set_button_visibility(self, page): stage_page = self.get_nth_page(page) if not stage_page.actions: self._buttons['complete'].show() + self._buttons['complete'].make_default() else: for action in stage_page.actions: button = self._buttons.get(action.value) if button is not None: + if button.action == stage_page.default: + button.make_default() button.show() elif page == Page.ERROR: @@ -328,6 +327,7 @@ def __init__(self): self._dataform_widget = None self._notes = [] self._last_stage_data = None + self.default = None self.show_all() @property @@ -347,6 +347,7 @@ def process_stage(self, stage_data): self._last_stage_data = stage_data self._show_notes(stage_data.notes) self._show_form(stage_data.data) + self.default = stage_data.default def _show_form(self, form): if self._dataform_widget is not None: @@ -482,3 +483,20 @@ def show_command_button(self): @show_command_button.setter def show_command_button(self, value): self._show_command_button = value + + +class ActionButton(Gtk.Button): + def __init__(self, label, action): + Gtk.Button.__init__(self, label=label) + self.action = action + + if action == AdHocAction.CANCEL: + self.get_style_context().add_class('destructive-action') + if action == AdHocAction.EXECUTE: + self.get_style_context().add_class('suggested-action') + + def make_default(self): + self.get_style_context().add_class('suggested-action') + + def remove_default(self): + self.get_style_context().remove_class('suggested-action') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/028a2abfdc794d35b789f95d06038394… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/028a2abfdc794d35b789f95d06038394… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] AdHoc: Parse default action
by Philipp Hörist 22 Nov '20

22 Nov '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ceea0a8d by lovetox at 2020-11-22T22:56:39+01:00 AdHoc: Parse default action - - - - - 2 changed files: - nbxmpp/modules/adhoc.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -96,11 +96,18 @@ class AdHoc(BaseModule): notes.append(AdHocCommandNote(text=note.getData(), type=type_)) + default = None actions_ = command.getTag('actions') if actions_ is not None: for action_ in actions_.getChildren(): actions.append(AdHocAction(action_.getName())) + default = actions_.getAttr('execute') + if default is not None: + default = AdHocAction(default) + if default not in actions: + default = None + yield AdHocCommand( jid=str(response.getFrom()), name=None, @@ -109,6 +116,7 @@ class AdHoc(BaseModule): status=AdHocStatus(attrs['status']), data=command.getTag('x', namespace=Namespace.DATA), actions=actions, + default=default, notes=notes) except Exception as error: raise MalformedStanzaError(str(error), response) ===================================== nbxmpp/structs.py ===================================== @@ -396,14 +396,14 @@ class DiscoIdentity(namedtuple('DiscoIdentity', 'category type name lang')): return hash(str(self)) -class AdHocCommand(namedtuple('AdHocCommand', 'jid node name sessionid status data actions notes')): +class AdHocCommand(namedtuple('AdHocCommand', 'jid node name sessionid status data actions default notes')): __slots__ = [] def __new__(cls, jid, node, name, sessionid=None, status=None, - data=None, actions=None, notes=None): + data=None, actions=None, default=None, notes=None): return super(AdHocCommand, cls).__new__(cls, jid, node, name, sessionid, - status, data, actions, notes) + status, data, actions, default, notes) @property def is_completed(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ceea0a8d6a6bdc9eabeb710f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ceea0a8d6a6bdc9eabeb710f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Test: Add more values to dataform test
by Philipp Hörist 22 Nov '20

22 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7819a8e8 by lovetox at 2020-11-22T18:26:46+01:00 Test: Add more values to dataform test So we can see a scrollbar - - - - - 4da4aa82 by lovetox at 2020-11-22T19:11:01+01:00 Test: Add long multi-list entry So we can test ellipsizing and the tooltip - - - - - 8645a286 by lovetox at 2020-11-22T19:13:21+01:00 DataForm: Improve ListMutliTreeView - Disable horizontal scrollbar so the treeview expands - Ellipsize values after 40 chars - Add row tooltip if entries were ellipsized - - - - - 2 changed files: - gajim/gtk/dataform.py - test/gtk/dataform.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -375,6 +375,7 @@ def __init__(self, field, form_grid, options): self._widget.set_propagate_natural_height(True) self._widget.set_min_content_height(100) self._widget.set_max_content_height(300) + self._widget.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) self._widget.add(self._treeview) def validate(self): @@ -388,10 +389,13 @@ def __init__(self, field, multi_field): self._field = field self._multi_field = multi_field - self._store = Gtk.ListStore(str, str, bool) + # label, value, tooltip, toggled + self._store = Gtk.ListStore(str, str, str, bool) col = Gtk.TreeViewColumn() cell = Gtk.CellRendererText() + cell.set_property('ellipsize', Pango.EllipsizeMode.END) + cell.set_property('width-chars', 40) col.pack_start(cell, True) col.set_attributes(cell, text=0) self.append_column(col) @@ -403,15 +407,20 @@ def __init__(self, field, multi_field): cell.set_property('xpad', 10) cell.connect('toggled', self._toggled) col.pack_start(cell, True) - col.set_attributes(cell, active=2) + col.set_attributes(cell, active=3) self.append_column(col) self.set_headers_visible(False) for option in field.options: - # option = (label, value) + label, value = option self._store.append( - [*option, option[1] in field.values]) + [label, value, label, value in field.values]) + + labels_over_max_width = map(lambda x: len(x) > 40, + [option[0] for option in field.options]) + if any(labels_over_max_width): + self.set_tooltip_column(2) self.set_model(self._store) ===================================== test/gtk/dataform.py ===================================== @@ -76,6 +76,9 @@ <option label='Polls'><value>polls</value></option> <option label='Reminders'><value>reminders</value></option> <option label='Search'><value>search</value></option> + <option label='Search1'><value>search1</value></option> + <option label='Really long long long long long long long long entry'><value>longentry</value></option> + <option label='Search3'><value>search3</value></option> <value>news</value> <value>search</value> </field> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0f5ef09a6100b64cd8aadf557da71ae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0f5ef09a6100b64cd8aadf557da71ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DataForm: Trigger validation for list-single fields
by Philipp Hörist 22 Nov '20

22 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0f5ef09a by lovetox at 2020-11-22T16:40:33+01:00 DataForm: Trigger validation for list-single fields - - - - - 1 changed file: - gajim/gtk/dataform.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -361,6 +361,7 @@ def __init__(self, field, form_grid, options): def _changed(self, widget): self._field.value = widget.get_active_id() + self._validate() class ListMultiField(Field): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f5ef09a6100b64cd8aadf557da71ae7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f5ef09a6100b64cd8aadf557da71ae7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] OpenPGP: Parse multiple 'to' elements
by Philipp Hörist 19 Nov '20

19 Nov '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 231904ad by lovetox at 2020-11-19T21:27:32+01:00 OpenPGP: Parse multiple 'to' elements - - - - - 1 changed file: - nbxmpp/modules/openpgp.py Changes: ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -23,6 +23,7 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import Node from nbxmpp.protocol import StanzaMalformed +from nbxmpp.protocol import JID from nbxmpp.util import b64decode from nbxmpp.util import b64encode from nbxmpp.structs import StanzaHandler @@ -275,9 +276,17 @@ def parse_signcrypt(stanza): stanza.getNamespace() != Namespace.OPENPGP): raise StanzaMalformed('Invalid signcrypt node') - to = stanza.getTagAttr('to', 'jid') - if to is None: - raise StanzaMalformed('Invalid to attr') + to_nodes = stanza.getTags('to') + if not to_nodes: + raise StanzaMalformed('missing to nodes') + + recipients = [] + for to_node in to_nodes: + jid = to_node.getAttr('jid') + try: + recipients.append(JID.from_string(jid)) + except Exception as error: + raise StanzaMalformed('Invalid jid: %s %s' % (jid, error)) timestamp = stanza.getTagAttr('time', 'stamp') if timestamp is None: @@ -286,10 +295,10 @@ def parse_signcrypt(stanza): payload = stanza.getTag('payload') if payload is None or payload.getChildren() is None: raise StanzaMalformed('Invalid payload node') - return payload.getChildren(), to, timestamp + return payload.getChildren(), recipients, timestamp -def create_signcrypt_node(stanza, not_encrypted_nodes): +def create_signcrypt_node(stanza, recipients, not_encrypted_nodes): ''' <signcrypt xmlns='urn:xmpp:openpgp:0'> <to jid='juliet(a)example.org'/> @@ -314,7 +323,8 @@ def create_signcrypt_node(stanza, not_encrypted_nodes): stanza.delChild(node) signcrypt = Node('signcrypt', attrs={'xmlns': Namespace.OPENPGP}) - signcrypt.addChild('to', attrs={'jid': str(stanza.getTo().bare)}) + for recipient in recipients: + signcrypt.addChild('to', attrs={'jid': str(recipient)}) timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) signcrypt.addChild('time', attrs={'stamp': timestamp}) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/231904ad7fd75ca58aa908ea… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/231904ad7fd75ca58aa908ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatSettings: Create box only on demand
by Philipp Hörist 18 Nov '20

18 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 80289935 by lovetox at 2020-11-18T23:05:12+01:00 GroupChatSettings: Create box only on demand - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -177,9 +177,7 @@ def __init__(self, parent_win, contact, muc_data, acct): self.xml.info_box.add(self._muc_info_box) # Groupchat settings - self._groupchat_settings_box = GroupChatSettings( - self.account, self.room_jid) - self.xml.settings_scrolled_box.add(self._groupchat_settings_box) + self._groupchat_settings_box = None # Groupchat invite self.xml.quick_invite_button.set_action_name( @@ -469,6 +467,14 @@ def _on_information(self, _action, _param): self._show_page('muc-info') def _on_groupchat_settings(self, _action, _param): + if self._groupchat_settings_box is not None: + self.xml.settings_scrolled_box.remove(self._groupchat_settings_box) + self._groupchat_settings_box.destroy() + + self._groupchat_settings_box = GroupChatSettings( + self.account, self.room_jid) + self._groupchat_settings_box.show_all() + self.xml.settings_scrolled_box.add(self._groupchat_settings_box) self._show_page('muc-settings') def _on_invite(self, _action, _param): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80289935bdd3cacb208141cac35be6a0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80289935bdd3cacb208141cac35be6a0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Simplify context dependent settings
by Philipp Hörist 18 Nov '20

18 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: de206c40 by lovetox at 2020-11-18T22:58:24+01:00 Settings: Simplify context dependent settings - - - - - 8 changed files: - gajim/common/contacts.py - gajim/common/modules/chat_markers.py - gajim/common/modules/mam.py - gajim/common/settings.py - gajim/groupchat_control.py - gajim/gtk/const.py - gajim/gtk/groupchat_settings.py - gajim/gtk/settings.py Changes: ===================================== gajim/common/contacts.py ===================================== @@ -271,14 +271,8 @@ def can_notify(self): if not self.is_groupchat: raise ValueError - disco_info = app.storage.cache.get_last_disco_info(self.jid) - - context = 'public' - if disco_info is not None and disco_info.muc_is_members_only: - context = 'private' - all_ = app.settings.get('notify_on_all_muc_messages') - room = self.settings.get('notify_on_all_messages', context=context) + room = self.settings.get('notify_on_all_messages') return all_ or room ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -91,14 +91,8 @@ def _send_marker(self, contact, marker, id_, type_): jid = app.get_jid_without_resource(contact.jid) if type_ in ('gc', 'pm'): - disco_info = app.storage.cache.get_last_disco_info(jid) - - context = 'public' - if disco_info is not None and disco_info.muc_is_members_only: - context = 'private' - if not app.settings.get_group_chat_setting( - self._account, jid, 'send_marker', context=context): + self._account, jid, 'send_marker'): return else: if not app.settings.get_contact_setting( ===================================== gajim/common/modules/mam.py ===================================== @@ -374,16 +374,9 @@ def request_archive_on_signin(self): def request_archive_on_muc_join(self, jid): _task = yield - disco_info = app.storage.cache.get_last_disco_info(jid) - - context = 'public' - if disco_info is not None and disco_info.muc_is_members_only: - context = 'private' - threshold = app.settings.get_group_chat_setting(self._account, jid, - 'sync_threshold', - context=context) + 'sync_threshold') self._log.info('Threshold for %s: %s', jid, threshold) if threshold == SyncThreshold.NO_SYNC: ===================================== gajim/common/settings.py ===================================== @@ -601,8 +601,7 @@ def set_account_setting(self, def get_group_chat_setting(self, account: str, jid: str, - setting: str, - context: str = None) -> SETTING_TYPE: + setting: str) -> SETTING_TYPE: if account not in self._account_settings: raise ValueError(f'Account missing: {account}') @@ -613,17 +612,26 @@ def get_group_chat_setting(self, try: return self._account_settings[account]['group_chat'][jid][setting] except KeyError: + + context = get_muc_context(jid) + if context is None: + # If there is no disco info available + # to determine the context assume public + log.warning('Unable to determine context for: %s', jid) + context = 'public' + default = ACCOUNT_SETTINGS['group_chat'][setting] if default is HAS_APP_DEFAULT: - if context is not None: - return self.get_app_setting( - f'gc_{setting}_{context}_default') + context_default_setting = f'gc_{setting}_{context}_default' + if context_default_setting in APP_SETTINGS: + return self.get_app_setting(context_default_setting) return self.get_app_setting(f'gc_{setting}_default') if default is HAS_ACCOUNT_DEFAULT: - if context is not None: - return self.get_account_setting( - account, f'gc_{setting}_{context}_default') + context_default_setting = f'gc_{setting}_{context}_default' + if context_default_setting in ACCOUNT_SETTINGS['account']: + return self.get_account_setting(account, + context_default_setting) return self.get_account_setting(account, f'gc_{setting}_default') @@ -633,8 +641,7 @@ def set_group_chat_setting(self, account: str, jid: str, setting: str, - value: SETTING_TYPE, - context: str = None) -> None: + value: SETTING_TYPE) -> None: if account not in self._account_settings: raise ValueError(f'Account missing: {account}') @@ -645,14 +652,22 @@ def set_group_chat_setting(self, default = ACCOUNT_SETTINGS['group_chat'][setting] if default in (HAS_APP_DEFAULT, HAS_ACCOUNT_DEFAULT): + context = get_muc_context(jid) + if context is None: + # If there is no disco info available + # to determine the context assume public + log.warning('Unable to determine context for: %s', jid) + context = 'public' + default_store = APP_SETTINGS if default is HAS_ACCOUNT_DEFAULT: default_store = ACCOUNT_SETTINGS['account'] - if context is None: - default = default_store[f'gc_{setting}_default'] + context_default_setting = f'gc_{setting}_{context}_default' + if context_default_setting in default_store: + default = default_store[context_default_setting] else: - default = default_store[f'gc_{setting}_{context}_default'] + default = default_store[f'gc_{setting}_default'] if not isinstance(value, type(default)) and value is not None: raise TypeError(f'Invalid type for {setting}: ' @@ -687,8 +702,7 @@ def set_group_chat_settings(self, if context is not None: if get_muc_context(jid) != context: continue - self.set_group_chat_setting( - account, jid, setting, value, context) + self.set_group_chat_setting(account, jid, setting, value) def get_contact_setting(self, account: str, ===================================== gajim/groupchat_control.py ===================================== @@ -178,7 +178,7 @@ def __init__(self, parent_win, contact, muc_data, acct): # Groupchat settings self._groupchat_settings_box = GroupChatSettings( - self.account, self.room_jid, self.context) + self.account, self.room_jid) self.xml.settings_scrolled_box.add(self._groupchat_settings_box) # Groupchat invite @@ -273,13 +273,6 @@ def room_name(self): def disco_info(self): return app.storage.cache.get_last_disco_info(self.contact.jid) - @property - def context(self): - disco_info = self.disco_info - if disco_info is None or not self.disco_info.muc_is_members_only: - return 'public' - return 'private' - def add_actions(self): super().add_actions() actions = [ ===================================== gajim/gtk/const.py ===================================== @@ -22,7 +22,7 @@ Filter = namedtuple('Filter', 'name pattern default') Setting = namedtuple('Setting', 'kind label type value name callback data desc ' - 'bind inverted enabled_func context props') + 'bind inverted enabled_func props') Setting.__new__.__defaults__ = (None,) * len(Setting._fields) # type: ignore @unique ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -24,7 +24,7 @@ class GroupChatSettings(SettingsBox): - def __init__(self, account, jid, context): + def __init__(self, account, jid): SettingsBox.__init__(self, account, jid) self.get_style_context().add_class('settings-border') @@ -52,8 +52,7 @@ def __init__(self, account, jid, context): Setting(SettingKind.SWITCH, _('Notify on all Messages'), SettingType.GROUP_CHAT, - 'notify_on_all_messages', - context=context), + 'notify_on_all_messages'), Setting(SettingKind.SWITCH, _('Minimize on Close'), @@ -75,14 +74,12 @@ def __init__(self, account, jid, context): _('Send Chat Markers'), SettingType.GROUP_CHAT, 'send_marker', - context=context, desc=_('Let others know if you read up to this point')), Setting(SettingKind.POPOVER, _('Sync Threshold'), SettingType.GROUP_CHAT, 'sync_threshold', - context=context, props={'entries': THRESHOLD_OPTIONS}), ] ===================================== gajim/gtk/settings.py ===================================== @@ -148,8 +148,7 @@ def __init__(self, desc, bind, inverted, - enabled_func, - context): + enabled_func): Gtk.ListBoxRow.__init__(self) self._grid = Gtk.Grid() @@ -163,7 +162,6 @@ def __init__(self, self.label = label self.account = account self.jid = jid - self.context = context self.name = name self.bind = bind self.inverted = inverted @@ -252,11 +250,10 @@ def get_value(self): return self.__get_value(self.type_, self.value, self.account, - self.jid, - self.context) + self.jid) @staticmethod - def __get_value(type_, value, account, jid, context): + def __get_value(type_, value, account, jid): if value is None: return None if type_ == SettingType.VALUE: @@ -267,7 +264,7 @@ def __get_value(type_, value, account, jid, context): if type_ == SettingType.GROUP_CHAT: return app.settings.get_group_chat_setting( - account, jid, value, context) + account, jid, value) if type_ == SettingType.CONFIG: return app.settings.get(value) @@ -308,7 +305,7 @@ def set_value(self, state): elif self.type_ == SettingType.GROUP_CHAT: app.settings.set_group_chat_setting( - self.account, self.jid, self.value, state, self.context) + self.account, self.jid, self.value, state) if self.callback is not None: self.callback(state, self.data) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/de206c40cbf8e879a218cb0c3e00f074… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/de206c40cbf8e879a218cb0c3e00f074… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2020