Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Pushed new branch contact-muc-context
by Daniel Brötzmann (＠wurstsalat) 07 Oct '22

07 Oct '22

Daniel Brötzmann pushed new branch contact-muc-context at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/contact-muc-context You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Features dialog: Simplify statements on Windows
by Daniel Brötzmann (＠wurstsalat) 07 Oct '22

07 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6fc44b33 by wurstsalat at 2022-10-07T12:16:36+02:00 imprv: Features dialog: Simplify statements on Windows - - - - - 1 changed file: - gajim/gtk/features.py Changes: ===================================== gajim/gtk/features.py ===================================== @@ -87,6 +87,10 @@ def _add_feature(self, feature: Feature) -> None: self.feature_listbox.add(item) def _get_features(self) -> list[Feature]: + tray_icon_available = bool( + sys.platform == 'win32' or + app.is_installed('APPINDICATOR') or + app.is_installed('AYATANA_APPINDICATOR')) av_available = app.is_installed('AV') and sys.platform != 'win32' notification_sounds_available: bool = ( app.is_installed('GSOUND') or sys.platform in ('win32', 'darwin')) @@ -97,13 +101,11 @@ def _get_features(self) -> list[Feature]: auto_status_enabled = bool(any(auto_status)) return [ - Feature(_('App Indicator Icon'), - app.is_installed('APPINDICATOR') or - app.is_installed('AYATANA_APPINDICATOR'), - _('Enables Gajim to provide a system notification area ' - 'icon'), + Feature(_('Notification Area Icon'), + tray_icon_available, + _('Enables Gajim to provide a notification area icon'), _('Requires: libappindicator3'), - _('Feature not available under Windows'), + _('No additional requirements'), None), Feature(_('Audio / Video'), av_available, @@ -111,11 +113,11 @@ def _get_features(self) -> list[Feature]: _('Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, ' 'gstreamer1.0-plugins-base, gstreamer1.0-plugins-ugly, ' 'gstreamer1.0-libav, and gstreamer1.0-gtk3'), - _('Feature not available under Windows'), + _('Feature not available on Windows'), None), Feature(_('Automatic Status'), self._idle_available(), - _("Enables Gajim to measure your computer's idle time in " + _('Enables Gajim to measure your computer’s idle time in ' 'order to set your Status automatically'), _('Requires: libxss'), _('No additional requirements'), @@ -131,22 +133,21 @@ def _get_features(self) -> list[Feature]: _('Enables Gajim to store Passwords securely instead of ' 'storing them in plaintext'), _('Requires: gnome-keyring or kwallet'), - _('Windows Credential Vault is used for secure password ' - 'storage'), + _('No additional requirements'), app.settings.get('use_keyring')), Feature(_('Spell Checker'), app.is_installed('GSPELL'), _('Enables Gajim to spell check your messages while ' 'composing'), _('Requires: Gspell'), - _('Requires: Gspell'), + _('No additional requirements'), spell_check_enabled), Feature(_('UPnP-IGD Port Forwarding'), app.is_installed('UPNP'), _('Enables Gajim to request your router to forward ports ' 'for file transfers'), _('Requires: gir1.2-gupnpigd-1.0'), - _('Feature not available under Windows'), + _('Feature not available on Windows'), None) ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6fc44b33203ac562a3b368a3e4f44b19… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6fc44b33203ac562a3b368a3e4f44b19… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: MUC: Remove broken join timeout code
by Philipp Hörist (＠lovetox) 06 Oct '22

06 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d3a242ca by Philipp Hörist at 2022-10-06T23:41:43+02:00 cfix: MUC: Remove broken join timeout code - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -143,7 +143,6 @@ def __init__(self, con: types.Client) -> None: self._on_client_resume_failed) self._rejoin_muc: set[str] = set() - self._join_timeouts: dict[str, int] = {} self._rejoin_timeouts: dict[str, int] = {} self._muc_service_jid = None self._joined_users: defaultdict[ @@ -362,7 +361,6 @@ def leave(self, if muc_data.state.is_not_joined: return - self._remove_join_timeout(room_jid) self._remove_rejoin_timeout(room_jid) self._con.get_module('Presence').send_presence( @@ -563,7 +561,6 @@ def _on_muc_user_presence(self, if properties.is_muc_destroyed: self._log.info('MUC destroyed: %s', room_jid) - self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._con.get_module('Bookmarks').remove(room_jid) room.set_not_joined() @@ -630,8 +627,6 @@ def _on_muc_user_presence(self, if properties.is_new_room: self.configure_room(room_jid) - self._start_join_timeout(room_jid) - presence = self._process_user_presence(properties) self._process_occupant_presence_change(properties, presence, @@ -793,20 +788,6 @@ def _remove_rejoin_timeout(self, room_jid: str) -> None: GLib.source_remove(id_) del self._rejoin_timeouts[room_jid] - def _start_join_timeout(self, room_jid: str) -> None: - self._remove_join_timeout(room_jid) - self._log.info('Start join timeout for: %s', room_jid) - id_ = GLib.timeout_add_seconds( - 10, self._fake_subject_change, room_jid) - self._join_timeouts[room_jid] = id_ - - def _remove_join_timeout(self, room_jid: str) -> None: - id_ = self._join_timeouts.get(room_jid) - if id_ is not None: - self._log.info('Remove join timeout for: %s', room_jid) - GLib.source_remove(id_) - del self._join_timeouts[room_jid] - def _on_subject_change(self, _con: types.xmppClient, _stanza: Message, @@ -868,19 +849,10 @@ def _on_moderation(self, raise nbxmpp.NodeProcessed - def _fake_subject_change(self, room_jid: str) -> None: - # This is for servers which don’t send empty subjects as part of the - # event order on joining a MUC. For example jabber.ru - self._log.warning('Fake subject received for %s', room_jid) - del self._join_timeouts[room_jid] - room = self._get_contact(room_jid) - room.notify('room-joined') - def cancel_password_request(self, room_jid: str) -> None: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) def _room_join_complete(self, muc_data: MUCData): - self._remove_join_timeout(muc_data.jid) self._set_muc_state(muc_data.jid, MUCJoinedState.JOINED) self._remove_rejoin_timeout(muc_data.jid) @@ -1128,9 +1100,6 @@ def _remove_all_timeouts(self) -> None: for room_jid in list(self._rejoin_timeouts.keys()): self._remove_rejoin_timeout(room_jid) - for room_jid in list(self._join_timeouts.keys()): - self._remove_join_timeout(room_jid) - def cleanup(self) -> None: super().cleanup() self._remove_all_timeouts() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d3a242ca8a08461a8bea962152cd2807… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d3a242ca8a08461a8bea962152cd2807… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cfix: BaseModule: Disconnect all client event handlers on cleanup()
by Philipp Hörist (＠lovetox) 06 Oct '22

06 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c5a44be1 by Philipp Hörist at 2022-10-06T21:24:10+02:00 cfix: BaseModule: Disconnect all client event handlers on cleanup() - - - - - ff4df9d9 by Philipp Hörist at 2022-10-06T21:24:49+02:00 refactor: MUC: Remove all timeouts on cleanup() - - - - - 2 changed files: - gajim/common/modules/base.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/base.py ===================================== @@ -114,3 +114,4 @@ def _get_contact(self, def cleanup(self) -> None: self.unregister_events() + self._client.disconnect_all_from_obj(self) ===================================== gajim/common/modules/muc.py ===================================== @@ -216,12 +216,7 @@ def _set_muc_state(self, room_jid: str, state: MUCJoinedState) -> None: contact.notify('state-changed') def _reset_state(self) -> None: - for room_jid in list(self._rejoin_timeouts.keys()): - self._remove_rejoin_timeout(room_jid) - - for room_jid in list(self._join_timeouts.keys()): - self._remove_join_timeout(room_jid) - + self._remove_all_timeouts() for muc in self._mucs.values(): self._joined_users.pop(muc.jid, None) self._set_muc_state(muc.jid, MUCJoinedState.NOT_JOINED) @@ -1128,3 +1123,14 @@ def _on_client_resume_failed(self, _signal_name: str ) -> None: self._reset_state() + + def _remove_all_timeouts(self) -> None: + for room_jid in list(self._rejoin_timeouts.keys()): + self._remove_rejoin_timeout(room_jid) + + for room_jid in list(self._join_timeouts.keys()): + self._remove_join_timeout(room_jid) + + def cleanup(self) -> None: + super().cleanup() + self._remove_all_timeouts() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/37dca1cb6eb5d5dd9f693c7cd93ac3f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/37dca1cb6eb5d5dd9f693c7cd93ac3f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Remove usage of app.connections in tests
by Daniel Brötzmann (＠wurstsalat) 06 Oct '22

06 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 37dca1cb by wurstsalat at 2022-10-06T16:55:49+02:00 refactor: Remove usage of app.connections in tests - - - - - 1 changed file: - test/no_gui/test_nick_completion.py Changes: ===================================== test/no_gui/test_nick_completion.py ===================================== @@ -24,7 +24,7 @@ def test_generate_suggestions(self): participant.name = name participants.append(participant) - app.connections = MagicMock() + app.get_client = MagicMock() app.storage.archive = MagicMock() app.storage.archive.get_recent_muc_nicks = MagicMock( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/37dca1cb6eb5d5dd9f693c7cd93ac3f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/37dca1cb6eb5d5dd9f693c7cd93ac3f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Remove usage of app.connections
by Philipp Hörist (＠lovetox) 05 Oct '22

05 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8b014a4 by Philipp Hörist at 2022-10-06T00:00:19+02:00 refactor: Remove usage of app.connections - - - - - 20 changed files: - gajim/common/application.py - gajim/common/dbus/remote_control.py - gajim/common/helpers.py - gajim/common/modules/caps.py - gajim/common/passwords.py - gajim/gtk/account_side_bar.py - gajim/gtk/accounts.py - gajim/gtk/application.py - gajim/gtk/avatar.py - gajim/gtk/bookmarks.py - gajim/gtk/discovery.py - gajim/gtk/filetransfer.py - gajim/gtk/main_stack.py - gajim/gtk/mam_preferences.py - gajim/gtk/settings.py - gajim/gtk/start_chat.py - gajim/gtk/status_message_selector.py - gajim/gtk/synchronize_accounts.py - gajim/gui_interface.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/application.py ===================================== @@ -159,9 +159,9 @@ def start_shutdown(self, *args: Any, **kwargs: Any) -> None: accounts_to_disconnect: dict[str, Client] = {} - for account, client in app.connections.items(): - if app.account_is_available(account): - accounts_to_disconnect[account] = client + for client in app.get_clients(): + if client.state.is_available: + accounts_to_disconnect[client.account] = client if not accounts_to_disconnect: self._quit_app() @@ -224,10 +224,10 @@ def _network_status_changed(self, self._log.info('Network connection available') else: self._log.info('Network connection lost') - for connection in app.connections.values(): - if (connection.state.is_connected or - connection.state.is_available): - connection.disconnect(gracefully=False, reconnect=True) + for client in app.get_clients(): + if (client.state.is_connected or + client.state.is_available): + client.disconnect(gracefully=False, reconnect=True) def _check_for_updates(self) -> None: if not app.settings.get('check_for_update'): ===================================== gajim/common/dbus/remote_control.py ===================================== @@ -307,10 +307,12 @@ def change_status(status: str, message: str, account: str) -> bool: status = '' if account: if not status: - if account not in app.connections: + if account not in app.settings.get_active_accounts(): return False - status = app.connections[account].status - GLib.idle_add(app.connections[account].change_status, status, + status = app.get_client(account).status + + GLib.idle_add(app.get_client(account).change_status, + status, message) # pyright: ignore else: # account not specified, so change the status of all accounts @@ -318,13 +320,12 @@ def change_status(status: str, message: str, account: str) -> bool: if not app.settings.get_account_setting( acc, 'sync_with_global_status'): continue - if status: - status_ = status - else: - if acc not in app.connections: - continue - status_ = app.connections[acc].status - GLib.idle_add(app.connections[acc].change_status, status_, + + if not status: + status = app.get_client(acc).status + + GLib.idle_add(app.get_client(acc).change_status, + status, message) # pyright: ignore return False @@ -346,15 +347,15 @@ def account_info(account: str) -> dict[str, str]: Show info on account: resource, jid, nick, prio, message ''' result: dict[str, str] = {} - if account in app.connections: + if account in app.settings.get_active_accounts(): # account is valid - con = app.connections[account] - result['status'] = con.status - result['name'] = con.name - result['jid'] = app.get_jid_from_account(con.name) - result['message'] = con.status_message - result['priority'] = str(con.priority) - result['resource'] = app.settings.get_account_setting(con.name, + client = app.get_client(account) + result['status'] = client.status + result['name'] = client.name + result['jid'] = app.get_jid_from_account(client.name) + result['message'] = client.status_message + result['priority'] = str(client.priority) + result['resource'] = app.settings.get_account_setting(client.name, 'resource') return result ===================================== gajim/common/helpers.py ===================================== @@ -509,11 +509,11 @@ def get_client_status(account: str) -> str: def get_global_show() -> str: maxi = 0 - for account in app.connections: - if not app.settings.get_account_setting(account, + for client in app.get_clients(): + if not app.settings.get_account_setting(client.account, 'sync_with_global_status'): continue - status = get_client_status(account) + status = get_client_status(client.account) index = SHOW_LIST.index(status) if index > maxi: maxi = index @@ -523,14 +523,14 @@ def get_global_show() -> str: def get_global_status_message() -> str: maxi = 0 status_message = '' - for account, con in app.connections.items(): - if not app.settings.get_account_setting(account, + for client in app.get_clients(): + if not app.settings.get_account_setting(client.account, 'sync_with_global_status'): continue - index = SHOW_LIST.index(con.status) + index = SHOW_LIST.index(client.status) if index > maxi: maxi = index - status_message = con.status_message + status_message = client.status_message return status_message @@ -539,7 +539,8 @@ def statuses_unified() -> bool: Test if all statuses are the same ''' reference = None - for account in app.connections: + for client in app.get_clients(): + account = client.account if not app.settings.get_account_setting(account, 'sync_with_global_status'): continue @@ -670,9 +671,11 @@ def get_optional_features(account: str) -> list[str]: features.append(Namespace.NICK + '+notify') - if app.connections[account].get_module('Bookmarks').nativ_bookmarks_used: + client = app.get_client(account) + + if client.get_module('Bookmarks').nativ_bookmarks_used: features.append(Namespace.BOOKMARKS_1 + '+notify') - elif app.connections[account].get_module('Bookmarks').pep_bookmarks_used: + elif client.get_module('Bookmarks').pep_bookmarks_used: features.append(Namespace.BOOKMARKS + '+notify') if app.is_installed('AV'): features.append(Namespace.JINGLE_RTP) @@ -686,8 +689,8 @@ def get_optional_features(account: str) -> list[str]: def jid_is_blocked(account: str, jid: str) -> bool: - con = app.connections[account] - return jid in con.get_module('Blocking').blocked + client = app.get_client(account) + return jid in client.get_module('Blocking').blocked def get_subscription_request_msg(account: Optional[str] = None) -> str: ===================================== gajim/common/modules/caps.py ===================================== @@ -193,9 +193,9 @@ def update_caps(self) -> None: if not app.account_is_available(self._account): return - app.connections[self._account].change_status( - app.connections[self._account].status, - app.connections[self._account].status_message) + client = app.get_client(self._account) + client.change_status(client.status, + client.status_message) def cleanup(self) -> None: self._remove_all_tasks() ===================================== gajim/common/passwords.py ===================================== @@ -145,8 +145,8 @@ def get_password(account_name: str) -> Optional[str]: def save_password(account_name: str, password: str) -> bool: - if account_name in app.connections: - app.connections[account_name].password = password + if account_name in app.settings.get_active_accounts(): + app.get_client(account_name).password = password if not app.settings.get_account_setting(account_name, 'savepass'): return True @@ -157,8 +157,8 @@ def save_password(account_name: str, password: str) -> bool: def delete_password(account_name: str) -> None: - if account_name in app.connections: - app.connections[account_name].password = None + if account_name in app.settings.get_active_accounts(): + app.get_client(account_name).password = None if app.settings.get('use_keyring'): return SecretPasswordStorage.delete_password(account_name) ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -38,8 +38,7 @@ def __init__(self) -> None: self.get_style_context().add_class('account-sidebar') self.connect('row-activated', self._on_row_activated) - self._accounts: list[str] = list(app.connections.keys()) - for account in self._accounts: + for account in app.settings.get_active_accounts(): self.add_account(account) def add_account(self, account: str) -> None: ===================================== gajim/gtk/accounts.py ===================================== @@ -558,12 +558,12 @@ def _disable() -> None: switch.set_state(state) self._set_label(state) - old_state = app.settings.get_account_setting(account, 'active') - if old_state == state: + account_is_active = app.settings.get_account_setting(account, 'active') + if account_is_active == state: return Gdk.EVENT_PROPAGATE - if (account in app.connections and - not app.connections[account].state.is_disconnected): + if (account_is_active and + not app.get_client(account).state.is_disconnected): # Connecting or connected window = cast(AccountsWindow, get_app_window('AccountsWindow')) ConfirmationDialog( @@ -1003,7 +1003,7 @@ def __init__(self, account: str, parent: Gtk.Window) -> None: def on_destroy(self, *args: Any) -> None: # Update priority - if self.account not in app.connections: + if self.account not in app.settings.get_active_accounts(): return client = app.get_client(self.account) show = client.status ===================================== gajim/gtk/application.py ===================================== @@ -271,7 +271,7 @@ def _startup(self) -> None: MainWindow() def _open_uris(self, uris: list[str]) -> None: - accounts = list(app.connections.keys()) + accounts = app.settings.get_active_accounts() if not accounts: return @@ -668,7 +668,7 @@ def _on_content_action(_action: Gio.SimpleAction, @staticmethod def _on_join_support_chat(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: - accounts = list(app.connections.keys()) + accounts = app.settings.get_active_accounts() if len(accounts) == 1: app.interface.show_add_join_groupchat( accounts[0], GAJIM_SUPPORT_JID) ===================================== gajim/gtk/avatar.py ===================================== @@ -456,8 +456,8 @@ def get_muc_surface(self, # (e.g. avatar cache deleted) app.storage.cache.set_muc(jid, 'avatar', None) - con = app.connections[account] - name = get_groupchat_name(con, jid) + client = app.get_client(account) + name = get_groupchat_name(client, jid) letter = generate_avatar_letter(name) surface = generate_default_avatar(letter, str(jid), size, scale, style) self._cache[jid][(size, scale, None)] = surface ===================================== gajim/gtk/bookmarks.py ===================================== @@ -40,8 +40,8 @@ def __init__(self, account: str) -> None: self._ui = get_builder('bookmarks.ui') self.add(self._ui.bookmarks_grid) - con = app.connections[account] - for bookmark in con.get_module('Bookmarks').bookmarks: + client = app.get_client(account) + for bookmark in client.get_module('Bookmarks').bookmarks: self._ui.bookmarks_store.append([str(bookmark.jid), bookmark.name, bookmark.nick, ===================================== gajim/gtk/discovery.py ===================================== @@ -368,8 +368,8 @@ def get_info(self, jid, node, cb, force=False, nofetch=False, args=()): self._cbs[cbkey].append(cb) else: self._cbs[cbkey] = [cb] - con = app.connections[self.account] - con.get_module('Discovery').disco_info( + client = app.get_client(self.account) + client.get_module('Discovery').disco_info( jid, node, callback=self._disco_info_received) def get_items(self, jid, node, cb, force=False, nofetch=False, args=()): @@ -394,8 +394,8 @@ def get_items(self, jid, node, cb, force=False, nofetch=False, args=()): self._cbs[cbkey].append(cb) else: self._cbs[cbkey] = [cb] - con = app.connections[self.account] - con.get_module('Discovery').disco_items( + client = app.get_client(self.account) + client.get_module('Discovery').disco_items( jid, node, callback=self._disco_items_received) def _disco_info_received(self, task): @@ -526,10 +526,10 @@ def __init__(self, account, jid='', node=None, address_entry=False, # Get a ServicesCache object. try: - self.cache = app.connections[account].services_cache + self.cache = app.get_client(account).services_cache except AttributeError: self.cache = ServicesCache(account) - app.connections[account].services_cache = self.cache + app.get_client(account).services_cache = self.cache if initial_identities: self.cache._on_agent_info(jid, node, initial_identities, [], None) @@ -1871,8 +1871,8 @@ def __init__(self, account, jid, node): self.subscribe_button = None self.unsubscribe_button = None - con = app.connections[account] - con.get_module('PubSub').send_pb_subscription_query( + client = app.get_client(account) + client.get_module('PubSub').send_pb_subscription_query( jid, self._on_pep_subscriptions) def _create_treemodel(self): @@ -2062,8 +2062,8 @@ def _on_subscribe_button_clicked(self, widget): node = model.get_value(iter_, 1) # 1 = groupnode - con = app.connections[self.account] - con.get_module('PubSub').send_pb_subscribe( + client = app.get_client(self.account) + client.get_module('PubSub').send_pb_subscribe( self.jid, node, self._on_pep_subscribe, groupnode=node) def _on_unsubscribe_button_clicked(self, widget): @@ -2077,8 +2077,8 @@ def _on_unsubscribe_button_clicked(self, widget): node = model.get_value(iter_, 1) # 1 = groupnode - con = app.connections[self.account] - con.get_module('PubSub').send_pb_unsubscribe( + client = app.get_client(self.account) + client.get_module('PubSub').send_pb_unsubscribe( self.jid, node, self._on_pep_unsubscribe, groupnode=node) def _on_pep_subscriptions(self, _nbxmpp_client, request): @@ -2185,10 +2185,10 @@ def _on_send_button_clicked(self, w): True)]) # Publish it to node - con = app.connections[self.account] - con.get_module('PubSub').publish(self.groupid, - item, - jid=self.servicejid) + client = app.get_client(self.account) + client.get_module('PubSub').publish(self.groupid, + item, + jid=self.servicejid) # Close the window self.window.destroy() ===================================== gajim/gtk/filetransfer.py ===================================== @@ -601,7 +601,7 @@ def _remove_transfer(self, iter_, sid, file_props): if file_props.tt_account: # file transfer is set account = file_props.tt_account - if account in app.connections: + if account in app.settings.get_active_accounts(): # there is a connection to the account client = app.get_client(account) client.get_module('Bytestream').remove_transfer(file_props) @@ -937,7 +937,7 @@ def _on_cancel_button_clicked(self, widget): def cancel_transfer(self, file_props: FileProp) -> None: # TODO: does not cancel transfer somehow account = file_props.tt_account - if account is None or account not in app.connections: + if account is None or account not in app.settings.get_active_accounts(): return client = app.get_client(account) # Check if we are in a IBB transfer ===================================== gajim/gtk/main_stack.py ===================================== @@ -44,7 +44,7 @@ def __init__(self) -> None: self._chat_page.connect('chat-selected', self._on_chat_selected) self.add_named(self._chat_page, 'chats') - for account in list(app.connections.keys()): + for account in app.settings.get_active_accounts(): self.add_account_page(account) def add_account_page(self, account: str) -> None: ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -47,7 +47,7 @@ def __init__(self, account: str) -> None: self.connect_after('key-press-event', self._on_key_press) self.account = account - self._con = app.connections[account] + self._client = app.get_client(account) self._destroyed = False self._ui = get_builder('mam_preferences.ui') @@ -63,7 +63,7 @@ def __init__(self, account: str) -> None: self._activate_spinner() - self._con.get_module('MAM').request_preferences( + self._client.get_module('MAM').request_preferences( callback=self._mam_prefs_received) def _on_destroy(self, widget: MamPreferences) -> None: @@ -156,7 +156,7 @@ def _on_save(self, _button: Gtk.Button) -> None: always.append(jid) else: never.append(jid) - self._con.get_module('MAM').set_preferences( + self._client.get_module('MAM').set_preferences( default, always, never, callback=self._mam_prefs_saved) def _activate_spinner(self) -> None: ===================================== gajim/gtk/settings.py ===================================== @@ -884,10 +884,10 @@ def show_dialog(self, parent: Gtk.Window) -> None: def update_activatable(self) -> None: activatable = False - if self.account in app.connections: - con = app.connections[self.account] - activatable = (con.state.is_available and - con.get_module('Register').supported) + if self.account in app.settings.get_active_accounts(): + client = app.get_client(self.account) + activatable = (client.state.is_available and + client.get_module('Register').supported) self.set_activatable(activatable) ===================================== gajim/gtk/start_chat.py ===================================== @@ -660,7 +660,7 @@ def _start_search(self) -> None: accounts = app.get_connected_accounts() if not accounts: return - client = app.connections[accounts[0]].connection + client = app.get_client(accounts[0]).connection text = self._ui.search_entry.get_text().strip() self._global_search_listbox.start_search() ===================================== gajim/gtk/status_message_selector.py ===================================== @@ -90,20 +90,20 @@ def _set_status_message(self, *args: Any) -> None: client = app.get_client(self._account) client.change_status(client.status, message) else: - for account in app.connections: + for client in app.get_clients(): if not app.settings.get_account_setting( - account, 'sync_with_global_status'): + client.account, 'sync_with_global_status'): continue - client = app.get_client(account) client.change_status(client.status, message) def update(self) -> None: if self._account is None: message = get_global_status_message() else: - if self._account not in app.connections: + try: + client = app.get_client(self._account) + except KeyError: return - client = app.get_client(self._account) message = client.status_message self._entry.set_text(message) ===================================== gajim/gtk/synchronize_accounts.py ===================================== @@ -93,7 +93,7 @@ def _init_accounts(self) -> None: model = self._ui.accounts_treeview.get_model() assert isinstance(model, Gtk.ListStore) model.clear() - for remote_account in app.connections: + for remote_account in app.settings.get_active_accounts(): if remote_account == self.account: # Do not show the account we're sync'ing continue ===================================== gajim/gui_interface.py ===================================== @@ -114,7 +114,7 @@ def __init__(self): self.instances: dict[str, Any] = {} - for acc in app.connections: + for acc in app.settings.get_active_accounts(): self.instances[acc] = { 'infos': {}, 'disco': {} @@ -545,7 +545,7 @@ def enable_account(self, account: str) -> None: app.ged.raise_event(AccountEnabled(account=account)) - app.connections[account].change_status('online', '') + app.get_client(account).change_status('online', '') window = get_app_window('AccountsWindow') if window is not None: GLib.idle_add(window.enable_account, account, True) @@ -563,7 +563,7 @@ def disable_account(self, account: str) -> None: build_accounts_menu() app.app.update_app_actions_state() - app.connections[account].cleanup() + app.get_client(account).cleanup() del app.connections[account] del self.instances[account] del app.nicks[account] @@ -592,8 +592,10 @@ def autoconnect(self) -> None: Auto connect at startup ''' - for account, con in app.connections.items(): - if not app.settings.get_account_setting(account, 'autoconnect'): + for client in app.get_clients(): + account = client.account + if not app.settings.get_account_setting(account, + 'autoconnect'): continue status = 'online' @@ -606,7 +608,7 @@ def autoconnect(self) -> None: account, 'last_status_msg') status_message = helpers.from_one_line(status_message) - con.change_status(status, status_message) + client.change_status(status, status_message) def change_status(self, status: str, @@ -620,12 +622,12 @@ def change_status(self, self._change_status(account, status) return - for acc in app.connections: - if not app.settings.get_account_setting(acc, + for client in app.get_clients(): + if not app.settings.get_account_setting(client.account, 'sync_with_global_status'): continue - self._change_status(acc, status) + self._change_status(client.account, status) @staticmethod def _change_status(account: str, status: str) -> None: @@ -684,8 +686,8 @@ def run(self, _application: Gtk.Application) -> None: app.plugin_repository = PluginRepository() - for con in app.connections.values(): - con.get_module('Roster').load_roster() + for client in app.get_clients(): + client.get_module('Roster').load_roster() # get instances for windows/dialogs that will show_all()/hide() self.instances['file_transfers'] = FileTransfersWindow() ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -480,7 +480,7 @@ def _remove_name_from_encryption_plugins(self, def _register_modules_with_handlers(self, plugin: GajimPlugin) -> None: if not hasattr(plugin, 'modules'): return - for client in app.connections.values(): + for client in app.get_clients(): for module in plugin.modules: instance, name = module.get_instance(client) modules.register_single_module(client, instance, name) @@ -491,7 +491,7 @@ def _register_modules_with_handlers(self, plugin: GajimPlugin) -> None: def _unregister_modules_with_handlers(self, plugin: GajimPlugin) -> None: if not hasattr(plugin, 'modules'): return - for client in app.connections.values(): + for client in app.get_clients(): for module in plugin.modules: instance = client.get_module(module.name) modules.unregister_single_module(client, module.name) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8b014a408585a7d8b1e321948ed98e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8b014a408585a7d8b1e321948ed98e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Control: Don’t add call row for every jingle request type
by Daniel Brötzmann (＠wurstsalat) 05 Oct '22

05 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 98beb62c by wurstsalat at 2022-10-05T23:42:56+02:00 cfix: Control: Don’t add call row for every jingle request type - - - - - 1 changed file: - gajim/gtk/control.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -405,6 +405,10 @@ def _on_jingle_request_received(self, if not self._is_event_processable(event): return + if not any(item in ('audio', 'video') for item in event.contents): + # This is not a call + return + active_jid = app.call_manager.get_active_call_jid() # Don't add a second row if contact upgrades to video if active_jid is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/98beb62c9a86fb45a0d248fe9cfc8fe6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/98beb62c9a86fb45a0d248fe9cfc8fe6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: new: Client: Add is_destroyed() method
by Philipp Hörist (＠lovetox) 05 Oct '22

05 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 39628b6d by Philipp Hörist at 2022-10-05T22:59:05+02:00 new: Client: Add is_destroyed() method - - - - - adb5f1a2 by Philipp Hörist at 2022-10-05T22:59:05+02:00 refactor: MessageActionsBox: Check if client is already destroyed - - - - - b613e763 by Philipp Hörist at 2022-10-05T22:59:05+02:00 refactor: ConversationView: Move special row creation into switch_contact() - - - - - 30071a1f by Philipp Hörist at 2022-10-05T22:59:05+02:00 cfix: VCardAvatars: Set task obsolete if we are not connected - - - - - 126829fa by Philipp Hörist at 2022-10-05T22:59:05+02:00 cfix: Accounts: Execute disable_account() as late as possible - - - - - 7a98a1f2 by Philipp Hörist at 2022-10-05T22:59:05+02:00 cfix: RemoveAccount: Execute remove_account() as late as possible - - - - - c71ca59b by Philipp Hörist at 2022-10-05T22:59:05+02:00 refactor: Client: Remove workaround when disabling account We only call disable account when we are disconnected now. - - - - - 6 changed files: - gajim/common/client.py - gajim/common/modules/vcard_avatars.py - gajim/gtk/accounts.py - gajim/gtk/conversation/view.py - gajim/gtk/message_actions_box.py - gajim/gtk/remove_account.py Changes: ===================================== gajim/common/client.py ===================================== @@ -150,6 +150,9 @@ def local_address(self) -> Optional[str]: return address.to_string().split(':')[0] return None + def is_destroyed(self) -> bool: + return self._destroyed + def set_remove_account(self, value: bool) -> None: # Used by the RemoveAccount Assistant to make the Client # not react to any stream errors that happen while the @@ -157,16 +160,6 @@ def set_remove_account(self, value: bool) -> None: self._remove_account = value def _create_client(self) -> None: - if self._destroyed: - # If we disable an account cleanup() is called and all - # modules are unregistered. Because disable_account() does not wait - # for the client to properly disconnect, handlers of the - # nbxmpp.Client() are emitted after we called cleanup(). - # After nbxmpp.Client() disconnects and is destroyed we create a - # new instance with this method but modules.get_handlers() fails - # because modules are already unregistered. - # TODO: Make this nicer - return log.info('Create new nbxmpp client') self._client = NBXMPPClient(log_context=self._account) self.connection = self._client @@ -645,12 +638,7 @@ def cleanup(self) -> None: Monitor.disconnect(self._idle_handler_id) app.app.disconnect(self._screensaver_handler_id) if self._client is not None: - # cleanup() is called before nbmxpp.Client has disconnected, - # when we disable the account. So we need to unregister - # handlers here. - # TODO: cleanup() should not be called before disconnect is finished - for handler in modules.get_handlers(self): - self._client.unregister_handler(handler) + self._client.destroy() modules.unregister_modules(self) def quit(self, kill_core: bool) -> None: ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -257,9 +257,11 @@ def preconditions_met(self) -> bool: try: client = app.get_client(self._contact.account) except Exception: + self.set_obsolete() return False if not client.state.is_available: + self.set_obsolete() return False if isinstance(self._contact, GroupchatParticipant): ===================================== gajim/gtk/accounts.py ===================================== @@ -545,13 +545,13 @@ def _on_disconnect(event: AccountDisconnected) -> None: if event.account != account: return app.ged.remove_event_handler('account-disconnected', - ged.CORE, + ged.POSTGUI, _on_disconnect) app.interface.disable_account(account) def _disable() -> None: app.ged.register_event_handler('account-disconnected', - ged.CORE, + ged.POSTGUI, _on_disconnect) client = app.get_client(account) client.change_status('offline', 'offline') ===================================== gajim/gtk/conversation/view.py ===================================== @@ -187,6 +187,12 @@ def switch_contact(self, contact: ChatContactT) -> None: self._block_signals = True self._reset() + self._read_marker_row = ReadMarkerRow(self._contact) + self._list_box.add(self._read_marker_row) + + self._scroll_hint_row = ScrollHintRow(self._contact.account) + self._list_box.add(self._scroll_hint_row) + app.settings.disconnect_signals(self) app.settings.connect_signal('print_join_left', @@ -232,15 +238,6 @@ def _reset(self) -> None: self._read_marker_row = None self._scroll_hint_row = None - if self._contact is not None: - # These need to be present if ConversationView is reset - # without switch_contact being invoked - self._read_marker_row = ReadMarkerRow(self._contact) - self._list_box.add(self._read_marker_row) - - self._scroll_hint_row = ScrollHintRow(self._contact.account) - self._list_box.add(self._scroll_hint_row) - def reset(self) -> None: assert self._contact is not None self.switch_contact(self._contact) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -230,7 +230,7 @@ def switch_contact(self, contact: ChatContactT) -> None: self._update_message_input_state() def clear(self) -> None: - if self._client is not None: + if self._client is not None and not self._client.is_destroyed(): self._set_chatstate(False) self._client.disconnect_all_from_obj(self) ===================================== gajim/gtk/remove_account.py ===================================== @@ -69,8 +69,9 @@ def __init__(self, account: str) -> None: self.connect('destroy', self._on_destroy) self.register_events([ - ('account-connected', ged.GUI1, self._on_account_connected), - ('account-disconnected', ged.GUI1, self._on_account_disconnected), + ('account-connected', ged.POSTGUI, self._on_account_connected), + ('account-disconnected', ged.POSTGUI, + self._on_account_disconnected), ]) self._set_remove_from_server_checkbox() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/81365d4e8da0287213c7019716c7525… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/81365d4e8da0287213c7019716c7525… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Use custom icon for 'Send Message' action
by Daniel Brötzmann (＠wurstsalat) 05 Oct '22

05 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 81365d4e by wurstsalat at 2022-10-05T22:49:22+02:00 fix: Use custom icon for 'Send Message' action 'document-send' from Adwaita does not fit anymore - - - - - 2 changed files: - gajim/data/gui/message_actions_box.ui - + gajim/data/icons/hicolor/scalable/status/gajim-send-message.svg Changes: ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -173,7 +173,7 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">document-send</property> + <property name="icon-name">gajim-send-message</property> </object> </child> <style> ===================================== gajim/data/icons/hicolor/scalable/status/gajim-send-message.svg ===================================== @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + width="512" + height="512" + viewBox="0 0 135.46666 135.46667" + version="1.1" + id="svg5" + xml:space="preserve" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)" + sodipodi:docname="gajim-send-message.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview + id="namedview7" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + inkscape:document-units="mm" + showgrid="false" + inkscape:zoom="1.2364896" + inkscape:cx="186.41483" + inkscape:cy="266.07583" + inkscape:window-width="1920" + inkscape:window-height="998" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /><defs + id="defs2" /><g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1"><path + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 9.673706,8.83164 127.91123,65.911624 7.5554375,126.63503 C 40.054761,63.597339 39.950704,71.699546 9.673706,8.83164 Z" + id="path365" + sodipodi:nodetypes="cccc" /></g></svg> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/81365d4e8da0287213c7019716c7525d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/81365d4e8da0287213c7019716c7525d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: AccountBadge: Make account an optional argument
by Philipp Hörist (＠lovetox) 05 Oct '22

05 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a8f89ea4 by Philipp Hörist at 2022-10-05T21:03:45+02:00 refactor: AccountBadge: Make account an optional argument - - - - - cd7cbc7d by Philipp Hörist at 2022-10-05T21:04:32+02:00 refactor: Banner: Don’t recreate account badge on contact switch - - - - - 2 changed files: - gajim/gtk/chat_banner.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -56,10 +56,13 @@ def __init__(self) -> None: self.add(self._ui.banner_box) self._ui.connect_signals(self) - self._account_badge: Optional[AccountBadge] = None + self._account_badge = AccountBadge() self._voice_requests_button = VoiceRequestsButton() + self._ui.additional_items_box.pack_start( self._voice_requests_button, False, True, 0) + self._ui.additional_items_box.pack_end( + self._account_badge, False, True, 0) hide_roster = app.settings.get('hide_groupchat_occupants_list') self._set_toggle_roster_button_icon(hide_roster) @@ -307,16 +310,15 @@ def _update_name_label(self) -> None: self._ui.name_label.set_tooltip_text(tooltip_text) def _update_account_badge(self) -> None: - assert self._contact is not None + if self._contact is None: + self._account_badge.set_visible(False) + return - if self._account_badge is not None: - self._account_badge.destroy() + visible = app.get_number_of_accounts() > 1 + if visible: + self._account_badge.set_account(self._contact.account) - enabled_accounts = app.get_enabled_accounts_with_labels() - if len(enabled_accounts) > 1: - self._account_badge = AccountBadge(self._contact.account) - self._ui.additional_items_box.pack_end( - self._account_badge, False, True, 0) + self._account_badge.set_visible(visible) def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: self._ui.visitor_popover.popdown() ===================================== gajim/gtk/util.py ===================================== @@ -782,21 +782,22 @@ def _on_realize(*args: Any) -> None: class AccountBadge(Gtk.Label): - def __init__(self, account: str) -> None: + def __init__(self, account: Optional[str] = None) -> None: Gtk.Label.__init__(self) self.set_ellipsize(Pango.EllipsizeMode.END) self.set_max_width_chars(12) self.set_size_request(50, -1) self.get_style_context().add_class('badge') - self._account = account + self.set_no_show_all(True) - self.refresh() - self.show() + if account is not None: + self.set_account(account) + self.show() - def refresh(self) -> None: - label = app.get_account_label(self._account) + def set_account(self, account: str) -> None: + label = app.get_account_label(account) self.set_text(label) - account_class = app.css_config.get_dynamic_class(self._account) + account_class = app.css_config.get_dynamic_class(account) self.get_style_context().add_class(account_class) self.set_tooltip_text(_('Account: %s') % label) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/63a7891010a53be0009b6aff9d69d08… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/63a7891010a53be0009b6aff9d69d08… 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