Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: Remove ask for status settings
by Philipp Hörist (＠lovetox) 15 Jun '22

15 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 31515c82 by lovetox at 2022-06-15T21:46:49+02:00 fix: Remove ask for status settings Following settings are removed - ask_offline_status - always_ask_for_status_message With the new UI these settings make not much sense anymore as the status message field is right under the status selector. Fixes #10986 - - - - - 5 changed files: - gajim/common/helpers.py - gajim/common/setting_values.py - gajim/gtk/main.py - gajim/gtk/preferences.py - gajim/gui_interface.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1396,20 +1396,6 @@ def get_idle_status_message(state: str, status_message: str) -> str: return message -def ask_for_status_message(status: str, signin: bool = False) -> bool: - if status is None: - # We try to change the message - return True - - if signin: - return app.settings.get('ask_online_status') - - if status == 'offline': - return app.settings.get('ask_offline_status') - - return app.settings.get('always_ask_for_status_message') - - def get_group_chat_nick(account: str, room_jid: Union[JID, str]) -> str: nick = app.nicks[account] ===================================== gajim/common/setting_values.py ===================================== @@ -37,11 +37,9 @@ class _ACCOUNT_DEFAULT: # pylint: disable=line-too-long BoolSettings = Literal[ - 'always_ask_for_status_message', 'always_english_wikipedia', 'always_english_wiktionary', 'ascii_formatting', - 'ask_offline_status', 'ask_online_status', 'autoaway', 'autoxa', @@ -175,11 +173,9 @@ class _ACCOUNT_DEFAULT: AllSettingsT = Union[str, int, bool] APP_SETTINGS = { - 'always_ask_for_status_message': False, 'always_english_wikipedia': False, 'always_english_wiktionary': True, 'ascii_formatting': True, - 'ask_offline_status': False, 'ask_online_status': False, 'audio_input_device': 'autoaudiosrc ! volume name=gajim_vol', 'audio_input_volume': 50, ===================================== gajim/gtk/main.py ===================================== @@ -36,7 +36,6 @@ from gajim.common.const import Display from gajim.common.const import SimpleClientState from gajim.common.ged import EventHelper -from gajim.common.helpers import ask_for_status_message from gajim.common.i18n import _ from gajim.common.modules.bytestream import is_transfer_active from gajim.plugins.pluginmanager import PluginManifest @@ -875,13 +874,6 @@ def _on_file_request(self, event: events.FileRequestReceivedEvent) -> None: self._main_stack.process_event(event) def quit(self) -> None: - accounts = list(app.connections.keys()) - get_msg = False - for acct in accounts: - if app.account_is_available(acct): - get_msg = True - break - save_main_window_position() window_width, window_height = self.get_size() app.settings.set('mainwin_width', window_width) @@ -937,11 +929,7 @@ def on_continue(message: Optional[str]) -> None: return on_continue2(message) - if get_msg and ask_for_status_message('offline'): - print('TODO: Let user choose status message') - on_continue('') # status message here - else: - on_continue('') + on_continue('') def _on_plugin_updates_available(self, _repository: PluginRepository, ===================================== gajim/gtk/preferences.py ===================================== @@ -559,16 +559,6 @@ def __init__(self, *args: Any) -> None: _('Sign In'), SettingType.CONFIG, 'ask_online_status'), - - Setting(SettingKind.SWITCH, - _('Sign Out'), - SettingType.CONFIG, - 'ask_offline_status'), - - Setting(SettingKind.SWITCH, - _('Status Change'), - SettingType.CONFIG, - 'always_ask_for_status_message'), ] PreferenceBox.__init__(self, settings) ===================================== gajim/gui_interface.py ===================================== @@ -67,7 +67,6 @@ from gajim.common.events import FileHashError from gajim.common.events import FileProgress from gajim.common.events import FileError -from gajim.common.helpers import ask_for_status_message from gajim.common.structs import OutgoingMessage from gajim.common.i18n import _ from gajim.common.client import Client @@ -164,7 +163,7 @@ def handle_event_signed_in(event): if event.conn.get_module('MAM').available: event.conn.get_module('MAM').request_archive_on_signin() - if ask_for_status_message(event.conn.status, signin=True): + if app.settings.get('ask_online_status'): app.window.show_account_page(account) def handle_event_presence(self, event): @@ -565,18 +564,10 @@ def change_status(self, status: str, account: Optional[str] = None ) -> None: - ask = ask_for_status_message(status) if status is None: status = helpers.get_global_show() - if ask: - if account is None: - app.window.show_app_page() - else: - app.window.show_account_page(account) - return - if account is not None: self._change_status(account, status) return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/31515c8259744dcd0140809b76c1756a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/31515c8259744dcd0140809b76c1756a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: DBus: Unify presence signals
by Philipp Hörist (＠lovetox) 15 Jun '22

15 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 36c04c34 by lovetox at 2022-06-15T21:06:55+02:00 fix: DBus: Unify presence signals Unify all presence signals into one Fixes #10934 - - - - - 1 changed file: - gajim/remote_control.py Changes: ===================================== gajim/remote_control.py ===================================== @@ -22,6 +22,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any + import os import logging @@ -31,6 +33,7 @@ from gajim.common import app from gajim.common import ged from gajim.common import helpers +from gajim.common import events from gajim.common.structs import OutgoingMessage from gajim.gui.add_contact import AddContact @@ -207,15 +210,9 @@ class GajimRemote(Server): <signal name='AccountPresence'> <arg type='av' /> </signal> - <signal name='ContactAbsence'> - <arg type='av' /> - </signal> <signal name='ContactPresence'> <arg type='av' /> </signal> - <signal name='ContactStatus'> - <arg type='av' /> - </signal> <signal name='GCMessage'> <arg type='av' /> </signal> @@ -270,17 +267,12 @@ def on_message_sent(self, obj): self.raise_signal('MessageSent', (obj.account, [ obj.jid, obj.message, chatstate])) - def on_presence_received(self, obj): - if obj.old_show < 2 and obj.new_show > 1: - event = 'ContactPresence' - elif obj.old_show > 1 and obj.new_show < 2: - event = 'ContactAbsence' - elif obj.new_show > 1: - event = 'ContactStatus' - else: - return - self.raise_signal(event, (obj.conn.name, [obj.jid, obj.show, - obj.status, obj.resource, obj.prio, obj.timestamp])) + def on_presence_received(self, event: events.PresenceReceived) -> None: + self.raise_signal('ContactPresence', (event.account, [ + event.jid, + event.resource, + event.show, + event.status])) def on_subscribe_presence_received(self, obj): self.raise_signal('Subscribe', (obj.conn.name, [obj.jid, obj.status, @@ -315,7 +307,7 @@ def _nec_decrypted_message_received(self, obj): def on_our_status(self, event): self.raise_signal('AccountPresence', (event.show, event.account)) - def raise_signal(self, event_name, data): + def raise_signal(self, event_name: str, data: Any) -> None: log.info('Send event %s', event_name) self.con.emit_signal(None, '/org/gajim/dbus/RemoteObject', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/36c04c34fd6448ea4604e8e481f4707d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/36c04c34fd6448ea4604e8e481f4707d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Remove dead dbus signals/methods
by Philipp Hörist (＠lovetox) 15 Jun '22

15 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9c5d86d8 by lovetox at 2022-06-15T19:45:59+02:00 fix: Remove dead dbus signals/methods These signals/methods would not work because the events/code does not exist anymore - - - - - 9a99f7fe by lovetox at 2022-06-15T19:49:12+02:00 refactor: Remove start_chat dbus method This is available directly via `gajim --start-chat` - - - - - 1 changed file: - gajim/remote_control.py Changes: ===================================== gajim/remote_control.py ===================================== @@ -204,19 +204,9 @@ class GajimRemote(Server): <arg name='prio' type='s' /> <arg name='account' type='s' /> </method> - <method name='show_roster' /> - <method name='start_chat'> - <arg name='jid' type='s' /> - <arg direction='out' type='b' /> - </method> - <method name='toggle_ipython' /> - <method name='toggle_roster_appearance' /> <signal name='AccountPresence'> <arg type='av' /> </signal> - <signal name='ChatState'> - <arg type='av' /> - </signal> <signal name='ContactAbsence'> <arg type='av' /> </signal> @@ -226,30 +216,15 @@ class GajimRemote(Server): <signal name='ContactStatus'> <arg type='av' /> </signal> - <signal name='EntityTime'> - <arg type='av' /> - </signal> <signal name='GCMessage'> <arg type='av' /> </signal> - <signal name='GCPresence'> - <arg type='av' /> - </signal> <signal name='MessageSent'> <arg type='av' /> </signal> - <signal name='NewAccount'> - <arg type='av' /> - </signal> <signal name='NewMessage'> <arg type='av' /> </signal> - <signal name='Roster'> - <arg type='av' /> - </signal> - <signal name='RosterInfo'> - <arg type='av' /> - </signal> <signal name='Subscribe'> <arg type='av' /> </signal> @@ -259,9 +234,6 @@ class GajimRemote(Server): <signal name='Unsubscribed'> <arg type='av' /> </signal> - <signal name='VcardInfo'> - <arg type='av' /> - </signal> </interface> </node> ''' @@ -273,10 +245,6 @@ def __init__(self): super().__init__(self.con, '/org/gajim/dbus/RemoteObject') self.first_show = True - app.ged.register_event_handler('time-result-received', ged.POSTGUI, - self.on_time) - app.ged.register_event_handler('roster-info', ged.POSTGUI, - self.on_roster_info) app.ged.register_event_handler('presence-received', ged.POSTGUI, self.on_presence_received) app.ged.register_event_handler('subscribe-presence-received', @@ -291,10 +259,6 @@ def __init__(self): ged.POSTGUI, self._nec_decrypted_message_received) app.ged.register_event_handler('our-show', ged.POSTGUI, self.on_our_status) - app.ged.register_event_handler('account-created', ged.POSTGUI, - self.on_account_created) - app.ged.register_event_handler('vcard-received', ged.POSTGUI, - self.on_vcard_received) app.ged.register_event_handler('message-sent', ged.POSTGUI, self.on_message_sent) @@ -306,15 +270,6 @@ def on_message_sent(self, obj): self.raise_signal('MessageSent', (obj.account, [ obj.jid, obj.message, chatstate])) - def on_time(self, obj): - self.raise_signal('EntityTime', (obj.conn.name, [obj.jid.bare, - obj.jid.resource, - obj.time_info])) - - def on_roster_info(self, obj): - self.raise_signal('RosterInfo', (obj.conn.name, [obj.jid, obj.nickname, - obj.sub, obj.ask, obj.groups])) - def on_presence_received(self, obj): if obj.old_show < 2 and obj.new_show > 1: event = 'ContactPresence' @@ -360,12 +315,6 @@ def _nec_decrypted_message_received(self, obj): def on_our_status(self, event): self.raise_signal('AccountPresence', (event.show, event.account)) - def on_account_created(self, obj): - self.raise_signal('NewAccount', (obj.conn.name, obj.account_info)) - - def on_vcard_received(self, obj): - self.raise_signal('VcardInfo', (obj.account, obj.vcard_dict)) - def raise_signal(self, event_name, data): log.info('Send event %s', event_name) self.con.emit_signal(None, @@ -780,10 +729,6 @@ def _contacts_as_dbus_structure(self, bare_contact): def get_unread_msgs_number(self): return str(app.window.get_total_unread_count()) - def start_chat(self, jid=''): - app.app.activate_action('start-chat', GLib.Variant('s', jid)) - return True - def send_xml(self, xml, account): if account: app.connections[account].send_stanza(str(xml)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a46a10952a3608b814dc71b788f66d9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a46a10952a3608b814dc71b788f66d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Fix codestyle errors
by Philipp Hörist (＠lovetox) 14 Jun '22

14 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8f304acb by lovetox at 2022-06-14T23:46:35+02:00 chore: Fix codestyle errors - - - - - a46a1095 by lovetox at 2022-06-14T23:46:56+02:00 ci: Flake8: Update configuration - - - - - 13 changed files: - .ci/appveyor_build.py - .ci/debian_build.py - gajim/common/app.py - gajim/common/sound.py - gajim/dev/ipython_view.py - gajim/gajim.py - gajim/plugins/pluginmanager.py - gajim/plugins/repository.py - mac/makebundle.py - scripts/generate_ui_types.py - setup.cfg - setup.py - win/misc/depcheck.py Changes: ===================================== .ci/appveyor_build.py ===================================== @@ -51,7 +51,7 @@ def start_build() -> str: 'branch': BRANCH, 'commitId': os.environ['CI_COMMIT_SHA'], 'environmentVariables': { - 'GAJIM_VERSION': get_gajim_version(), + 'GAJIM_VERSION': get_gajim_version(), } } req = requests.post(BUILDS_API_URL, headers=HEADERS, json=payload) ===================================== .ci/debian_build.py ===================================== @@ -79,12 +79,12 @@ def prepare_changelog(context: ReleaseContext) -> None: def build(context: ReleaseContext) -> None: log.info('Start package build') subprocess.run( - [ - 'dpkg-buildpackage', - '--no-sign' - ], - cwd=context.release_dir, - check=True) + [ + 'dpkg-buildpackage', + '--no-sign' + ], + cwd=context.release_dir, + check=True) if __name__ == '__main__': ===================================== gajim/common/app.py ===================================== @@ -66,7 +66,8 @@ interface = cast(types.InterfaceT, None) -thread_interface = lambda *args: None # Interface to run a thread and then a callback +# Interface to run a thread and then a callback +thread_interface = None config = c_config.Config() settings = cast(types.SettingsT, None) version = gajim.__version__ @@ -74,18 +75,20 @@ avatar_cache: dict[str, dict[str, Any]] = {} bob_cache: dict[str, bytes] = {} ipython_window = None -app = None # type: GajimApplication -window = None # type: MainWindow +app = None # type: GajimApplication +window = None # type: MainWindow -ged = ged_module.GlobalEventsDispatcher() # Global Events Dispatcher +ged = ged_module.GlobalEventsDispatcher() # Global Events Dispatcher plugin_manager = cast(types.PluginManagerT, None) # Plugins Manager plugin_repository = cast(types.PluginRepositoryT, None) + class Storage: def __init__(self): self.cache: CacheStorage = None self.archive: MessageArchiveStorage = None + storage = Storage() css_config = cast(types.CSSConfigT, None) @@ -312,11 +315,12 @@ def detect_desktop_env() -> Optional[str]: return 'gnome' return desktop + desktop_env = detect_desktop_env() def get_server_from_jid(jid: str) -> str: - pos = jid.find('@') + 1 # after @ + pos = jid.find('@') + 1 # after @ return jid[pos:] @@ -324,10 +328,10 @@ def get_room_and_nick_from_fjid(jid: str) -> list[str]: # fake jid is the jid for a contact in a room # gaim(a)conference.jabber.no/nick/nick-continued # return ('gaim(a)conference.jabber.no', 'nick/nick-continued') - l = jid.split('/', 1) - if len(l) == 1: # No nick - l.append('') - return l + list_ = jid.split('/', 1) + if len(list_) == 1: # No nick + list_.append('') + return list_ def get_jid_without_resource(jid: str) -> str: @@ -446,7 +450,7 @@ def get_transport_name_from_jid( """ # TODO: Rewrite/remove - #FIXME: jid can be None! one TB I saw had this problem: + # FIXME: jid can be None! one TB I saw had this problem: # in the code block # it is a groupchat presence in handle_event_notify # jid was None. Yann why? if not jid: @@ -472,6 +476,7 @@ def get_transport_name_from_jid( return 'facebook' return None + def jid_is_transport(jid: str) -> bool: # if not '@' or '@' starts the jid then it is transport if jid.find('@') <= 0: @@ -551,7 +556,8 @@ def get_priority(account: str, show: str) -> int: show = 'online' if show in ('online', 'chat', 'away', 'xa', 'dnd') and \ - settings.get_account_setting(account, 'adjust_priority_with_status'): + settings.get_account_setting(account, + 'adjust_priority_with_status'): prio = settings.get_account_setting(account, 'autopriority_' + show) else: prio = settings.get_account_setting(account, 'priority') ===================================== gajim/common/sound.py ===================================== @@ -162,10 +162,13 @@ def _init_platform() -> PlaySound: return PlatformUnix() + _platform_player = _init_platform() + def play(path: Path, loop: bool = False) -> None: _platform_player.play(path, loop) + def stop(): _platform_player.stop() ===================================== gajim/dev/ipython_view.py ===================================== @@ -75,7 +75,6 @@ from IPython.core.display_trap import DisplayTrap - class MyPromptDisplayHook(DisplayHook): def __init__(self, shell, view): DisplayHook.__init__(self, shell=shell) @@ -129,7 +128,6 @@ def __init__(self, argv=None, user_ns=None, user_global_ns=None, cin=None, if input_func: IPython.terminal.interactiveshell.raw_input_original = input_func - # This is to get rid of the blockage that occurs during # IPython.Shell.InteractiveShell.user_setup() io.raw_input = lambda x: None ===================================== gajim/gajim.py ===================================== @@ -143,7 +143,7 @@ def _set_proc_title() -> None: if sysname == 'Linux': proc_name = b'gajim' - buff = create_string_buffer(len(proc_name)+1) + buff = create_string_buffer(len(proc_name) + 1) buff.value = proc_name libc.prctl(PR_SET_NAME, byref(buff), 0, 0, 0) elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -433,8 +433,8 @@ def _add_gui_extension_point_call_to_list(self, :type args: tuple ''' - if ((gui_extpoint_name not in self.gui_extension_points) - or (args not in self.gui_extension_points[gui_extpoint_name])): + if (gui_extpoint_name not in self.gui_extension_points or + args not in self.gui_extension_points[gui_extpoint_name]): self.gui_extension_points.setdefault(gui_extpoint_name, []).append( args) ===================================== gajim/plugins/repository.py ===================================== @@ -229,7 +229,8 @@ def download_plugins(self, manifests: Iterable[PluginManifest]) -> None: log.warning('Unable to download plugins because repository not set') return - manifests = [self._manifests[manifest.short_name] for manifest in manifests] + manifests = [self._manifests[manifest.short_name] for manifest + in manifests] manifests = set(manifests) - self._download_queue if not manifests: ===================================== mac/makebundle.py ===================================== @@ -1,4 +1,5 @@ #!/usr/bin/env python3 + import os import sys from argparse import ArgumentParser @@ -18,12 +19,25 @@ version = args.version else: try: - version = check_output(['git', 'describe', '--tags']).decode().strip() + version = check_output(['git', 'describe', '--tags']) + version = version.decode().strip() except CalledProcessError: version = 'unknown' dmg_name = 'gajim-{}.dmg'.format(version) - run(['cp', 'mac/gajim.spec', 'gajim.spec'], check=True) # the .spec has to be in the project root + # the .spec has to be in the project root + run(['cp', 'mac/gajim.spec', 'gajim.spec'], check=True) run(['pyinstaller', 'gajim.spec'], check=True) - run(['rm', '-rf', 'dist/launch']) # we only want Gajim.app in the dmg - run(['hdiutil', 'create', '-volname', 'Gajim', '-srcfolder', 'dist', '-ov', '-format', 'UDZO', dmg_name], check=True) + # we only want Gajim.app in the dmg + run(['rm', '-rf', 'dist/launch']) + run(['hdiutil', + 'create', + '-volname', + 'Gajim', + '-srcfolder', + 'dist', + '-ov', + '-format', + 'UDZO', + dmg_name], + check=True) ===================================== scripts/generate_ui_types.py ===================================== @@ -36,7 +36,7 @@ class Builder(Gtk.Builder): ... GET_BUILDER_OVERLOAD = ''' @overload -def get_builder(file_name: Literal['%s'], widgets: list[str] = ...) -> %s: ...''' +def get_builder(file_name: Literal['%s'], widgets: list[str] = ...) -> %s: ...''' # noqa GET_BUILDER = ''' def get_builder(file_name: str, widgets: list[str] = ...) -> Builder: ...''' ===================================== setup.cfg ===================================== @@ -14,6 +14,7 @@ exclude = max-complexity = 15 builtins=_ max-line-length = 80 +statistics = True [metadata] name = gajim ===================================== setup.py ===================================== @@ -162,7 +162,7 @@ def run(self): class install(_install): def run(self): - data_files = cast(DataFilesT, self.distribution.data_files) # pyright: ignore + data_files = cast(DataFilesT, self.distribution.data_files) # pyright: ignore # noqa: E501 install_trans(data_files) if sys.platform != 'win32': install_man(data_files) ===================================== win/misc/depcheck.py ===================================== @@ -16,7 +16,7 @@ import gi gi.require_version("GIRepository", "2.0") -from gi.repository import GIRepository +from gi.repository import GIRepository # noqa: E402 def get_required_by_typelibs() -> set[str]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/50aec5745171d286ed215c8349cfccb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/50aec5745171d286ed215c8349cfccb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ci: Flake8: Update configuration
by Philipp Hörist (＠lovetox) 14 Jun '22

14 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e3c87b9a by lovetox at 2022-06-14T22:37:20+02:00 ci: Flake8: Update configuration - - - - - 50aec574 by lovetox at 2022-06-14T22:37:20+02:00 chore: Fix codestyle errors - - - - - 3 changed files: - gajim/common/dbus/logind.py - gajim/common/dbus/system_style.py - setup.cfg Changes: ===================================== gajim/common/dbus/logind.py ===================================== @@ -95,7 +95,7 @@ def _obtain_delay_inhibitor(self, connection: Gio.DBusConnection) -> None: 'org.gajim.Gajim', _('Shutting down Gajim'), 'delay' # Inhibitor will delay but not block shutdown - )), + )), GLib.VariantType.new('(h)'), Gio.DBusCallFlags.NONE, -1, @@ -123,11 +123,11 @@ def release_delay_inhibitor(self) -> None: log.info('Released shutdown delay inhibitor') def _on_logind_appeared(self, - connection: Gio.DBusConnection, - name: str, - name_owner: str, - *_user_data: Any - ) -> None: + connection: Gio.DBusConnection, + name: str, + name_owner: str, + *_user_data: Any + ) -> None: '''Use signal and locks provided by org.freedesktop.login1''' log.info('Name %s appeared, owned by %s', name, name_owner) ===================================== gajim/common/dbus/system_style.py ===================================== @@ -83,7 +83,7 @@ def _signal_setting_changed(self, namespace, name, value = parameters if (namespace == 'org.freedesktop.appearance' and - name == 'color-scheme'): + name == 'color-scheme'): self._prefer_dark = (value == 1) self._callback() app.ged.raise_event(StyleChanged()) ===================================== setup.cfg ===================================== @@ -1,5 +1,5 @@ [flake8] -ignore = +ignore = W504 exclude = __pycache__, build, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a0a1ebe4fb30018000c9a3224194d19… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a0a1ebe4fb30018000c9a3224194d19… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ci: Flake8: Update configuration
by Philipp Hörist (＠lovetox) 14 Jun '22

14 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2ae59851 by lovetox at 2022-06-14T22:08:14+02:00 ci: Flake8: Update configuration - - - - - a0a1ebe4 by lovetox at 2022-06-14T22:08:14+02:00 ci: Add flake8 ci test - - - - - 2 changed files: - .gitlab-ci.yml - setup.cfg Changes: ===================================== .gitlab-ci.yml ===================================== @@ -33,6 +33,16 @@ test-pyright: - $(npm bin)/pyright interruptible: true +test-flake8: + stage: test + allow_failure: true + rules: + - changes: + - "**/*.py" + script: + - flake8 + interruptible: true + test-pylint: stage: test rules: ===================================== setup.cfg ===================================== @@ -1,8 +1,19 @@ [flake8] ignore = -exclude = .git,__pycache__,.gitlab +exclude = + __pycache__, + build, + dist, + debian_build, + test, + typings + gajim/command_system, + gajim/gajim_remote.py, + gajim/remote_control.py, + gajim/common/config.py max-complexity = 15 builtins=_ +max-line-length = 80 [metadata] name = gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4eb2372e4d20b5b9b5a32bed1ab183e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4eb2372e4d20b5b9b5a32bed1ab183e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update pyrightconfig
by Daniel Brötzmann (＠wurstsalat) 14 Jun '22

14 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4eb2372e by wurstsalat at 2022-06-14T20:45:55+02:00 chore: Update pyrightconfig - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -16,14 +16,12 @@ "scripts/*", "win/*", "gajim/gajim.py", + "gajim/common/dbus/*", "gajim/common/application.py", "gajim/common/call_manager.py", "gajim/common/cert_store.py", "gajim/common/configpaths.py", "gajim/common/const.py", - "gajim/common/dbus/location.py", - "gajim/common/dbus/music_track.py", - "gajim/common/dbus/system_style.py", "gajim/common/events.py", "gajim/common/exceptions.py", "gajim/common/filetransfer.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4eb2372e4d20b5b9b5a32bed1ab183e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4eb2372e4d20b5b9b5a32bed1ab183e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Logind: Listen to system shutdown and quit Gajim gracefully
by Daniel Brötzmann (＠wurstsalat) 14 Jun '22

14 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 95e2ca1a by wurstsalat at 2022-06-14T20:41:57+02:00 feat: Logind: Listen to system shutdown and quit Gajim gracefully Fixes #10040 - - - - - 2 changed files: - gajim/common/application.py - gajim/common/dbus/logind.py Changes: ===================================== gajim/common/application.py ===================================== @@ -36,6 +36,7 @@ from gajim.common import ged from gajim.common import configpaths from gajim.common import logging_helpers +from gajim.common.dbus import logind from gajim.common.events import AccountDisonnected from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable @@ -87,6 +88,8 @@ def _init_core(self) -> None: if sys.platform in ('win32', 'darwin'): GLib.timeout_add_seconds(20, self._check_for_updates) + else: + logind.enable() for account in app.settings.get_active_accounts(): app.connections[account] = Client(account) @@ -174,6 +177,7 @@ def _shutdown_core(self) -> None: app.storage.cache.shutdown() app.storage.archive.shutdown() self.end_profiling() + logind.shutdown() def _quit_app(self) -> None: self._shutdown_core() ===================================== gajim/common/dbus/logind.py ===================================== @@ -15,8 +15,8 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. ''' -Watch for system sleep using systemd-logind. -Documentation: http://www.freedesktop.org/wiki/Software/systemd/inhibit +Watch for system shutdown using systemd-logind. +Documentation: https://www.freedesktop.org/wiki/Software/systemd/inhibit ''' from __future__ import annotations @@ -52,56 +52,36 @@ def __init__(self) -> None: Gio.BusType.SYSTEM, 'org.freedesktop.login1', Gio.BusNameWatcherFlags.NONE, - self._on_appear_logind, - self._on_vanish_logind) - - def _on_prepare_for_sleep(self, - connection: Gio.DBusConnection, - _sender_name: str, - _object_path: str, - interface_name: str, - signal_name: str, - parameters: tuple[str, str, str], - *_user_data: Any - ) -> None: - '''Signal handler for PrepareForSleep event''' + self._on_logind_appeared, + self._on_logind_vanished) + + def _on_prepare_for_shutdown(self, + _connection: Gio.DBusConnection, + _sender_name: str, + _object_path: str, + interface_name: str, + signal_name: str, + parameters: tuple[str, str, str], + *_user_data: Any + ) -> None: + '''Signal handler for PrepareForShutdown event''' log.debug('Received signal %s.%s%s', interface_name, signal_name, parameters) - before = parameters[0] # Signal is either before or after sleep occurs - if before: - warn = self._inhibit_fd is None - log.log( - logging.WARNING if warn else logging.INFO, - 'Preparing for sleep by disconnecting from network%s', - ', without holding a sleep inhibitor' if warn else '') - - for name, conn in app.connections.items(): - if app.account_is_connected(name): - st = conn.status_message - conn.change_status('offline', - _('Machine is going to sleep')) - # TODO: Make this nicer - conn._status_message = st # pylint: disable=protected-access - conn.time_to_reconnect = 5 - - self._disinhibit_sleep() + if self._inhibit_fd is None: + log.warning('Preparing for shutdown by quitting Gajim, ' + 'without holding a shutdown inhibitor') else: - try: - self._inhibit_sleep(connection) - except GLib.Error as error: - log.warning('Inhibit failed: %s', error) + log.info('Preparing for shutdown by quitting Gajim') - for conn in app.connections.values(): - if conn.state.is_disconnected and conn.time_to_reconnect: - conn.reconnect() + app.window.quit() - def _inhibit_sleep(self, connection: Gio.DBusConnection) -> None: - '''Obtain a sleep delay inhibitor from logind''' + def _obtain_delay_inhibitor(self, connection: Gio.DBusConnection) -> None: + '''Obtain a shutdown delay inhibitor from logind''' if self._inhibit_fd is not None: # Something is wrong, we have an inhibitor fd, and we are asking for # yet another one. - log.warning('Trying to obtain a sleep inhibitor ' + log.warning('Trying to obtain a shutdown inhibitor ' 'while already holding one.') try: @@ -111,10 +91,10 @@ def _inhibit_sleep(self, connection: Gio.DBusConnection) -> None: 'org.freedesktop.login1.Manager', 'Inhibit', GLib.Variant('(ssss)', ( - 'sleep', + 'shutdown', 'org.gajim.Gajim', - _('Disconnect from the network'), - 'delay' # Inhibitor will delay but not block sleep + _('Shutting down Gajim'), + 'delay' # Inhibitor will delay but not block shutdown )), GLib.VariantType.new('(h)'), Gio.DBusCallFlags.NONE, @@ -123,59 +103,58 @@ def _inhibit_sleep(self, connection: Gio.DBusConnection) -> None: None) if result is None: log.warning( - 'Cannot obtain a sleep delay inhibitor from logind') + 'Could not obtain a shutdown delay inhibitor from logind') return ret, ret_fdlist = result except GLib.Error as error: log.warning( - 'Cannot obtain a sleep delay inhibitor from logind: %s', error) + 'Could not obtain a shutdown delay inhibitor from ' + 'logind: %s', error) return - log.info('Inhibit sleep') self._inhibit_fd = ret_fdlist.get(ret.unpack()[0]) + log.info('Obtained shutdown delay inhibitor') - def _disinhibit_sleep(self) -> None: - '''Relinquish our sleep delay inhibitor''' + def release_delay_inhibitor(self) -> None: + '''Release our shutdown delay inhibitor''' if self._inhibit_fd is not None: os.close(self._inhibit_fd) self._inhibit_fd = None - log.info('Disinhibit sleep') - - def _on_appear_logind(self, - connection: Gio.DBusConnection, - name: str, - name_owner: str, - *_user_data: Any - ) -> None: + log.info('Released shutdown delay inhibitor') + + def _on_logind_appeared(self, + connection: Gio.DBusConnection, + name: str, + name_owner: str, + *_user_data: Any + ) -> None: '''Use signal and locks provided by org.freedesktop.login1''' log.info('Name %s appeared, owned by %s', name, name_owner) connection.signal_subscribe( 'org.freedesktop.login1', 'org.freedesktop.login1.Manager', - 'PrepareForSleep', + 'PrepareForShutdown', '/org/freedesktop/login1', None, Gio.DBusSignalFlags.NONE, - self._on_prepare_for_sleep, + self._on_prepare_for_shutdown, None) - self._inhibit_sleep(connection) + self._obtain_delay_inhibitor(connection) - def _on_vanish_logind(self, - _connection: Gio.DBusConnection, - name: str, - *_user_data: Any - ) -> None: + def _on_logind_vanished(self, + _connection: Gio.DBusConnection, + name: str, + *_user_data: Any + ) -> None: '''Release remaining resources related to org.freedesktop.login1''' log.info('Name %s vanished', name) - self._disinhibit_sleep() + self.release_delay_inhibitor() def enable() -> None: - # Module should be rewritten - # Its not useful to know when the computer goes to sleep. - # Because of stream management we don’t need to do anything in that case. - # It would be useful to know when the computer powers off, in this case - # Gajim is shutdown and we should correctly disconnect. - return - # LogindListener.get() + LogindListener.get() + + +def shutdown() -> None: + LogindListener.get().release_delay_inhibitor() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/95e2ca1aa380c9e703db34bed6ddb386… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/95e2ca1aa380c9e703db34bed6ddb386… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: Chat commands: Better font readability
by Daniel Brötzmann (＠wurstsalat) 14 Jun '22

14 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b03d8465 by wurstsalat at 2022-06-14T18:16:48+02:00 imprv: Chat commands: Better font readability - - - - - 9b412938 by wurstsalat at 2022-06-14T18:16:48+02:00 fix: ChatActionProcessor: Fix iterating commands for popover - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/chat_action_processor.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -80,9 +80,9 @@ .conversation-date-row { padding: 12px; } .conversation-command-row label { + font-weight: 600; border-radius: 6px; padding: 12px; - font-size: small; } .conversation-subject-box, .conversation-call-box { ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -74,13 +74,11 @@ def _on_key_press(self, self._move_selection(Direction.NEXT) return True - if event.keyval == Gdk.KEY_Return: - selected_action = self._get_selected_action() - self._replace_text(selected_action) + if event.keyval in (Gdk.KEY_Left, Gdk.KEY_Right): self.popdown() - return True + return False - if event.keyval == Gdk.KEY_Tab: + if event.keyval in (Gdk.KEY_Return, Gdk.KEY_Tab): selected_action = self._get_selected_action() self._replace_text(selected_action) self.popdown() @@ -160,16 +158,19 @@ def _update_commands_menu(self, ) -> None: self._menu.remove_all() command_list = self._get_commands() + num_entries = 0 for command in command_list: if not command.startswith(action_text[1:]): continue - if command_list.index(command) >= MAX_ENTRIES: + if num_entries >= MAX_ENTRIES: continue + action_data = GLib.Variant('s', f'/{command}') menu_item = Gio.MenuItem() menu_item.set_label(f'/{command}') menu_item.set_attribute_value('action-data', action_data) self._menu.append_item(menu_item) + num_entries +=1 if self._menu.get_n_items() > 0: self._show_menu(start) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a3d0a0ba4e8c13b20a4d85bd77a307a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a3d0a0ba4e8c13b20a4d85bd77a307a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Make plugins_repository_enabled available via ACE
by Philipp Hörist (＠lovetox) 14 Jun '22

14 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a3d0a0ba by lovetox at 2022-06-14T17:38:45+02:00 fix: Make plugins_repository_enabled available via ACE - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -661,6 +661,7 @@ class WorkspaceSettings(TypedDict): 'notification_preview_message': _('Preview new messages in notification popup?'), 'notification_timeout': '', 'notify_on_all_muc_messages': '', + 'plugins_repository_enabled': _('If enabled, Gajim offers to download plugins hosted on gajim.org'), 'remote_commands': _('If enabled, Gajim will execute XEP-0146 Commands.'), 'remote_control': _('If checked, Gajim can be controlled remotely using gajim-remote.'), 'restore_timeout': _('How far back in time (minutes) chat history is restored. -1 means no limit.'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3d0a0ba4e8c13b20a4d85bd77a307a0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3d0a0ba4e8c13b20a4d85bd77a307a0… 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