Commits October 2021

commits@gajim.org

1 participants
72 discussions

[Git][gajim/gajim][mainwindow] 3 commits: Events: Actually retract events when disabling account
by Daniel Brötzmann (＠wurstsalat) 01 Oct '21

01 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: ac14cf41 by wurstsalat at 2021-10-02T00:30:32+02:00 Events: Actually retract events when disabling account - - - - - d498f9d4 by wurstsalat at 2021-10-02T00:38:11+02:00 Interface: Remove obsolete handle_event_roster_info - - - - - 53885de1 by wurstsalat at 2021-10-02T00:39:50+02:00 Remove obsolete instances - - - - - 2 changed files: - gajim/gui_interface.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -156,8 +156,7 @@ def __init__(self): for a in app.connections: self.instances[a] = { 'infos': {}, - 'disco': {}, - 'sub_request': {} + 'disco': {} } app.contacts.add_account(a) app.groups[a] = {} @@ -212,7 +211,6 @@ def _create_core_handlers_list(self): 'message-sent': [self.handle_event_msgsent], 'message-not-sent': [self.handle_event_msgnotsent], 'read-state-sync': [self.handle_event_read_state_sync], - # 'roster-info': [self.handle_event_roster_info], 'metacontacts-received': [self.handle_event_metacontacts], 'roster-item-exchange-received': [self.handle_event_roster_item_exchange], 'file-send-error': [self.handle_event_file_send_error], @@ -622,61 +620,6 @@ def handle_event_read_state_sync(event): app.events.remove_events(event.account, jid, types=types) - def handle_event_roster_info(self, obj): - # TODO: - # ('ROSTER_INFO', account, (jid, name, sub, ask, groups)) - account = obj.conn.name - contacts = app.contacts.get_contacts(account, obj.jid) - if (not obj.sub or obj.sub == 'none') and \ - (not obj.ask or obj.ask == 'none') and not obj.nickname and \ - not obj.groups: - # contact removed us. - if contacts: - self.roster.remove_contact(obj.jid, account, backend=True) - return - elif not contacts: - if obj.sub == 'remove': - return - # Add new contact to roster - - contact = app.contacts.create_contact(jid=obj.jid, - account=account, name=obj.nickname, groups=obj.groups, - show='offline', sub=obj.sub, ask=obj.ask, - avatar_sha=obj.avatar_sha) - app.contacts.add_contact(account, contact) - self.roster.add_contact(obj.jid, account) - else: - # If contact has changed (sub, ask or group) update roster - # Mind about observer status changes: - # According to xep 0162, a contact is not an observer anymore when - # we asked for auth, so also remove him if ask changed - old_groups = contacts[0].groups - if obj.sub == 'remove': - # another of our instance removed a contact. Remove it here too - self.roster.remove_contact(obj.jid, account, backend=True) - return - update = False - if contacts[0].sub != obj.sub or contacts[0].ask != obj.ask\ - or old_groups != obj.groups: - # c.get_shown_groups() has changed. Reflect that in - # roster_window - self.roster.remove_contact(obj.jid, account, force=True) - update = True - for contact in contacts: - contact.name = obj.nickname or '' - contact.sub = obj.sub - contact.ask = obj.ask - contact.groups = obj.groups or [] - if update: - self.roster.add_contact(obj.jid, account) - # Refilter and update old groups - for group in old_groups: - self.roster.draw_group(group, account) - self.roster.draw_contact(obj.jid, account) - if obj.jid in self.instances[account]['sub_request'] and obj.sub in ( - 'from', 'both'): - self.instances[account]['sub_request'][obj.jid].destroy() - @staticmethod def handle_event_metacontacts(obj): # TODO: Remove @@ -1171,8 +1114,7 @@ def enable_account(self, account): # update variables self.instances[account] = { 'infos': {}, - 'disco': {}, - 'sub_request': {} + 'disco': {} } app.groups[account] = {} @@ -1219,7 +1161,7 @@ def disable_account(self, account): 'account-disabled', account=account)) - # app.events.remove_account_events(account) + app.events.remove_account_events(account) if account == app.ZEROCONF_ACC_NAME: app.connections[account].disable_account() ===================================== test/lib/gajim_mocks.py ===================================== @@ -23,8 +23,10 @@ def __init__(self, account, *args): self.sessions = {} self.server_resource = 'Gajim' - app.interface.instances[account] = {'infos': {}, 'disco': {}, - 'gc_config': {}, 'search': {}, 'sub_request': {}} + app.interface.instances[account] = { + 'infos': {}, + 'disco': {} + } app.interface.minimized_controls[account] = {} app.contacts.add_account(account) app.groups[account] = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5ae9584c333c90be1587faed18735a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5ae9584c333c90be1587faed18735a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] SearchView: Imrprove Revealer behavior
by Daniel Brötzmann (＠wurstsalat) 01 Oct '21

01 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 5ae9584c by wurstsalat at 2021-10-02T00:10:04+02:00 SearchView: Imrprove Revealer behavior - - - - - 3 changed files: - gajim/gtk/chat_page.py - gajim/gtk/main.py - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -19,7 +19,6 @@ from gi.repository import GObject from gajim.common import app -from gajim.common.i18n import _ from .util import get_builder from .chat_filter import ChatFilter @@ -49,9 +48,10 @@ def __init__(self): self._search_view.connect('hide-search', self._on_search_hide) self._search_revealer = Gtk.Revealer() - self._search_revealer.set_reveal_child(True) + self._search_revealer.set_reveal_child(False) + self._search_revealer.set_transition_type( + Gtk.RevealerTransitionType.SLIDE_LEFT) self._search_revealer.set_halign(Gtk.Align.END) - self._search_revealer.set_no_show_all(True) self._search_revealer.add(self._search_view) self._ui.right_grid_overlay.add_overlay(self._search_revealer) @@ -139,11 +139,11 @@ def _on_search_history(self, _action, _param): if control is not None: self._search_view.set_context(control.account, control.contact.jid) self._search_view.clear() - self._search_revealer.show() + self._search_revealer.set_reveal_child(True) self._search_view.set_focus() def _on_search_hide(self, *args): - self._search_revealer.hide() + self._search_revealer.set_reveal_child(False) def _on_chat_list_changed(self, chat_list_stack, *args): chat_list = chat_list_stack.get_current_chat_list() @@ -268,4 +268,6 @@ def get_controls(self, account=None): def hide_search(self): if self._search_revealer.get_reveal_child(): - self._search_revealer.hide() + self._search_revealer.set_reveal_child(False) + return True + return False ===================================== gajim/gtk/main.py ===================================== @@ -215,7 +215,8 @@ def _on_action(self, action, _param): return res if action == 'escape': - self._chat_page.hide_search() + if self._chat_page.hide_search(): + return if action == 'escape' and app.settings.get('escape_key_closes'): self._chat_page.remove_chat(control.account, control.contact.jid) ===================================== gajim/gtk/search_view.py ===================================== @@ -55,7 +55,6 @@ def __init__(self): self.add(self._ui.search_box) self._ui.connect_signals(self) - self.connect('key-press-event', self._on_key_press) app.ged.register_event_handler('account-enabled', ged.GUI1, @@ -65,10 +64,6 @@ def __init__(self): self._on_account_state) self.show_all() - def _on_key_press(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - self.emit('hide-search') - def _on_account_state(self, _event): self.clear() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ae9584c333c90be1587faed18735a45… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ae9584c333c90be1587faed18735a45… 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 October 2021