Philipp Hörist pushed to branch mainwindow at gajim / gajim

Commits: 7bfebb23 by lovetox at 2021-01-31T21:32:45+01:00 Disable Roster

- - - - -

2 changed files:

- gajim/common/modules/roster.py - gajim/gui_interface.py

Changes:

===================================== gajim/common/modules/roster.py ===================================== @@ -50,15 +50,16 @@ def load_roster(self): self.set_raw(data) for jid, item in self._data.items(): self._log.debug('%s: %s', jid, item) - app.nec.push_incoming_event(NetworkEvent( - 'roster-info', - conn=self._con, + contact = app.contacts.create_contact( jid=jid, - nickname=item['name'], + account=self._account, + name=item['name'], + groups=item['groups'], + show='offline', sub=item['subscription'], ask=item['ask'], - groups=item['groups'], - avatar_sha=item['avatar_sha'])) + avatar_sha=item['avatar_sha']) + app.contacts.add_contact(self._account, contact) else: self._log.info('Database empty, reset roster version') app.settings.set_account_setting(

===================================== gajim/gui_interface.py ===================================== @@ -1116,7 +1116,7 @@ def create_core_handlers_list(self): 'password-required': [self.handle_event_password_required], 'plain-connection': [self.handle_event_plain_connection], 'presence-received': [self.handle_event_presence], - 'roster-info': [self.handle_event_roster_info], + # 'roster-info': [self.handle_event_roster_info], 'roster-item-exchange-received': \ [self.handle_event_roster_item_exchange], 'signed-in': [self.handle_event_signed_in], @@ -1789,7 +1789,8 @@ def autoconnect(self): account, 'last_status_msg') status_message = helpers.from_one_line(status_message)

- self.roster.send_status(account, status, status_message) + app.connections[account].change_status(status, status_message) + # self.roster.send_status(account, status, status_message)

def change_status(self, status=None): # status=None means we want to change the message only @@ -2077,7 +2078,7 @@ def run(self, application): if app.settings.get('trayicon') != 'never': self.show_systray()

- self.roster = roster_window.RosterWindow(application) + # self.roster = roster_window.RosterWindow(application) # if self.msg_win_mgr.mode == \ # MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: # self.msg_win_mgr.create_window(None, None, None) @@ -2087,10 +2088,10 @@ def run(self, application): app.plugin_manager = plugins.PluginManager() app.plugin_manager.init_plugins()

- self.roster._before_fill() + # self.roster._before_fill() for account in app.connections: app.connections[account].get_module('Roster').load_roster() - self.roster._after_fill() + # self.roster._after_fill()

# get instances for windows/dialogs that will show_all()/hide() self.instances['file_transfers'] = FileTransfersWindow()

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7bfebb2380168dbcb792ab8ad148096db...