Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] chore: Update translations
by Weblate (＠weblate) 24 Jul '22

24 Jul '22

Weblate pushed to branch master at gajim / gajim Commits: 1b53c571 by Weblate at 2022-07-24T16:23:28+02:00 chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations chore: Update translations - - - - - 26 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gajim.pot - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb_NO.po - po/nl.po - po/pl.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1b53c5713b2b2025c741973aa715654b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1b53c5713b2b2025c741973aa715654b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Archive: Remove leftover print statement
by Daniel Brötzmann (＠wurstsalat) 24 Jul '22

24 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 00df8738 by wurstsalat at 2022-07-24T17:26:08+02:00 Archive: Remove leftover print statement - - - - - 1 changed file: - gajim/common/storage/archive.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -1005,7 +1005,6 @@ def get_last_correctable_message(self, jids = [jid] account_id = self.get_account_id(account) min_time = time.time() - 5 * 60 - print(min_time) sql = ''' SELECT contact_name, time, kind, message, stanza_id, message_id, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00df8738a42417fd0e2a9bc19f7bc56e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00df8738a42417fd0e2a9bc19f7bc56e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 104 commits: chore: Update git update hook
by Philipp Hörist (＠lovetox) 24 Jul '22

24 Jul '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: 30e6108b by lovetox at 2022-06-27T00:57:30+02:00 chore: Update git update hook - - - - - f182fecb by lovetox at 2022-06-27T20:02:40+02:00 refactor: Replace reduce_chars_newlines() with stdlib - - - - - 17fe5225 by lovetox at 2022-06-27T22:19:35+02:00 fix: GtkStatusIcon: Always show when Gajim has not toplevel focus - - - - - 53b2dbca by lovetox at 2022-06-27T22:39:37+02:00 fix: StatusIcon: Don’t lose new message icon on state change Fixes #11013 - - - - - 0c7c1a87 by wurstsalat at 2022-06-28T10:29:40+02:00 imprv: ChatActionProcessor: Improve detection of emoji shortcode start - - - - - 35ad0441 by wurstsalat at 2022-06-28T16:03:36+02:00 imprv: Roster: Display show value in tooltip Fixes #11010 - - - - - e94c3bc8 by wurstsalat at 2022-06-28T23:44:55+02:00 chore: Update pyrightconfig - - - - - d12c76e5 by André Apitzsch at 2022-07-02T16:37:54+02:00 fix: CodeWidget: Don't highlight matching brackets Highlighting matching brackets is confusing without a visible cursor. Fixes #11026. - - - - - 4d113bb8 by lovetox at 2022-07-03T16:02:46+02:00 chore: Raise nbxmpp version - - - - - df2af1ee by Peter Shkenev at 2022-07-03T16:59:00+02:00 chore: Use proper dependency names in README - - - - - 792a83bf by wurstsalat at 2022-07-04T12:19:18+02:00 fix: ContactInfo: Preserve groups when changing contact name Fixes #11028 - - - - - dbf44701 by wurstsalat at 2022-07-04T12:35:17+02:00 fix: CodeWidget: Don’t default to python for highlighting Fixes #11012 - - - - - cb89f598 by lovetox at 2022-07-05T21:37:01+02:00 refactor: Remove side effects of password module Fixes: #11032 - - - - - 241f920a by lovetox at 2022-07-06T19:53:27+02:00 fix: Remote: Console scripts need a method as entry point Fixes: #11034 - - - - - 08a2139f by lovetox at 2022-07-06T22:50:00+02:00 chore: Update Release template - - - - - 8f032517 by André Apitzsch at 2022-07-07T18:46:32+02:00 fix: Flatpak: Fix display of tray icon using libappindicator Appindicator cannot access custom icons in flatpak. That's why the status is limited to * online state (gajim icon) and * new message state Fixes: #10869 - - - - - dc773376 by Weblate at 2022-07-07T20:47:03+02:00 chore: Update translations - - - - - 41433499 by lovetox at 2022-07-07T20:49:59+02:00 release: 1.4.6 - - - - - 318c1eaf by lovetox at 2022-07-07T21:04:11+02:00 ci: Use ssh to clone flatpak repository - - - - - 9c252dd0 by wurstsalat at 2022-07-08T22:45:28+02:00 fix: Preview: Hide download hint if we sent the file Fixes #11036 - - - - - 1405f22f by lovetox at 2022-07-10T17:00:19+02:00 perf: Roster: Sort more efficiently - - - - - 0bb75cdf by lovetox at 2022-07-10T17:31:45+02:00 chore: Ignore pyright error - - - - - 9aa42d78 by lovetox at 2022-07-10T22:21:46+02:00 perf: Roster: Don’t invalidate filter on contact update It’s enough to just evaluate the visibility for the contact instead of the whole roster - - - - - d4eb4a35 by lovetox at 2022-07-13T20:09:26+02:00 fix: GroupchatInfo: Don’t set subject when loading from disco info Disco provides only the subject text not the author and timestamp. It’s better to set this info separately when we receive the subject from the MUC. This has the drawback that we can’t show the subject when we only show the disco (StartChatDialog). But everything else would bring alot more complexity than it’s worth. Fixes #11040 - - - - - feaf6f49 by wurstsalat at 2022-07-18T21:48:28+02:00 fix: Preview: Allow manual download for all mime types Fixes #11044 - - - - - 4f486209 by wurstsalat at 2022-07-23T21:32:48+02:00 imprv: Preview: Add setting to disable file preview Fixes #10991 - - - - - d00dfe2e by wurstsalat at 2022-07-23T22:44:01+02:00 fix: ConversationView: Fix linting error - - - - - 3bc58246 by wurstsalat at 2022-07-23T22:44:01+02:00 imprv: Startup: Show hint in console if Gajim is already running Fixes #11039 - - - - - cc5d3ffa by wurstsalat at 2022-07-23T22:56:32+02:00 fix: Main Window: Move to stored position on startup - - - - - 0ad41c9c by lovetox at 2022-07-24T10:41:04+02:00 refactor: Remove redundant unicode string prefix This is only needed for python2 compat - - - - - 2242a9d8 by lovetox at 2022-07-24T10:48:33+02:00 refactor: Make credit constants lists - - - - - 81f3d555 by lovetox at 2022-07-24T10:59:33+02:00 refactor: Use single quotes - - - - - 6b5db823 by lovetox at 2022-07-24T10:59:51+02:00 ci: Update flake8 config - - - - - f2f022aa by lovetox at 2022-07-24T11:01:40+02:00 chore: Add new commit prefix - - - - - 059680f4 by wurstsalat at 2022-07-24T12:27:56+02:00 fix: Main Window: Use restore_main_window_position - - - - - 1514beca by wurstsalat at 2022-07-24T12:41:46+02:00 fix: Chat Markers: Don’t send marker for outgoing messages Fixes #11043 - - - - - b0fbea24 by lovetox at 2022-07-24T14:49:01+02:00 refactor: Use single quotes - - - - - 9f593b03 by lovetox at 2022-07-24T17:15:31+02:00 feat: New Message Action Box - - - - - 30720a83 by wurstsalat at 2022-07-24T17:15:33+02:00 refactor: Move ChatBanner into separate widget - - - - - c796c1d4 by wurstsalat at 2022-07-24T17:15:33+02:00 refactor: ChatBanner: Adapt to moved functionality - - - - - cefba3ac by wurstsalat at 2022-07-24T17:15:33+02:00 imprv: ChatBanner: Move separator - - - - - b5f60485 by lovetox at 2022-07-24T17:15:33+02:00 Cleanup GUI files - - - - - 7afca14c by wurstsalat at 2022-07-24T17:15:33+02:00 GUI files: Remove bottom margin - - - - - 1a4a1e3d by wurstsalat at 2022-07-24T17:15:33+02:00 ChatBanner: Fix toggle roster button - - - - - a95ec47a by wurstsalat at 2022-07-24T17:15:33+02:00 ChatBanner: Improve styling - - - - - d20fb537 by wurstsalat at 2022-07-24T17:15:33+02:00 PrivateChatControl: Remove obsolete method - - - - - d1d9f011 by lovetox at 2022-07-24T17:15:33+02:00 Move send_message() to chat stack - - - - - f400e971 by lovetox at 2022-07-24T17:15:33+02:00 Remove obsolete code - - - - - 50abb63d by wurstsalat at 2022-07-24T17:15:33+02:00 Controls: Remove obsolete code - - - - - 862d4bfc by lovetox at 2022-07-24T17:15:33+02:00 Things - - - - - 57ecc30c by wurstsalat at 2022-07-24T17:15:33+02:00 Fix GC roster revealer - - - - - d738614a by wurstsalat at 2022-07-24T17:15:33+02:00 Add, update, and handler equest-voice action - - - - - 14349868 by lovetox at 2022-07-24T17:15:33+02:00 Things2 - - - - - a2b13144 by lovetox at 2022-07-24T17:16:40+02:00 Refactor Actions - - - - - 00a99ea4 by wurstsalat at 2022-07-24T17:16:42+02:00 Fix SecurityLabelSelector - - - - - 6aab2e76 by wurstsalat at 2022-07-24T17:16:42+02:00 Adapt ChatActionProcessor and GroupChatNickCompletion - - - - - 7128af5e by wurstsalat at 2022-07-24T17:16:42+02:00 MessageInputTextView: Add draft support - - - - - 024ff7fd by wurstsalat at 2022-07-24T17:16:42+02:00 Move Separators to ChatStack - - - - - 4ac5f8d3 by wurstsalat at 2022-07-24T17:16:42+02:00 Menus: Add 'Search…' back to single chat menu - - - - - 770a0fe7 by wurstsalat at 2022-07-24T17:16:42+02:00 MessageActionsBox: Formatting, linting - - - - - 2d4333d3 by wurstsalat at 2022-07-24T17:16:42+02:00 Fix quoting and mentioning - - - - - 9510085a by wurstsalat at 2022-07-24T17:16:42+02:00 Add and update more Groupchat actions - - - - - d87cd4f4 by wurstsalat at 2022-07-24T17:16:42+02:00 Remove 'update_toolbar' and its GUI extension point - - - - - f114aad7 by wurstsalat at 2022-07-24T17:16:42+02:00 Fix updating message input state - - - - - 20c73cb6 by wurstsalat at 2022-07-24T17:16:42+02:00 Contacts: Add is_irc property - - - - - a8befe7d by wurstsalat at 2022-07-24T17:16:42+02:00 GroupchatControl UI: Remove obsolete destroy page - - - - - d97237f8 by wurstsalat at 2022-07-24T17:16:42+02:00 Move actions from GroupchatControl to ChatStack - - - - - 3ba1420b by wurstsalat at 2022-07-24T17:16:42+02:00 Remove update_actions method - - - - - b2dccb98 by wurstsalat at 2022-07-24T17:16:42+02:00 MessageActionBox: Use client's is_available - - - - - 2c1a8f12 by wurstsalat at 2022-07-24T17:16:42+02:00 Remove obsolete methods and code - - - - - 10ce71cd by wurstsalat at 2022-07-24T17:16:42+02:00 MessageInput: Use JID for draft dict key - - - - - c0f7fe15 by wurstsalat at 2022-07-24T17:16:42+02:00 Cleanup - - - - - b788925d by wurstsalat at 2022-07-24T17:16:42+02:00 Add general start_file_transfer method to Interface - - - - - 5fbdca61 by wurstsalat at 2022-07-24T17:16:42+02:00 Settings: Move GroupChatSetting to correct type - - - - - f8baf5bb by wurstsalat at 2022-07-24T17:16:42+02:00 ChatActionProcessor: Rename process_outgoing_message - - - - - 8eb163b8 by wurstsalat at 2022-07-24T17:16:42+02:00 Fix test, fix linter errors - - - - - 2e96723a by wurstsalat at 2022-07-24T17:16:42+02:00 Fix GroupChatNickCompletion test - - - - - 6a9ab848 by wurstsalat at 2022-07-24T17:16:42+02:00 Add ChatFunctionPage - - - - - 2e920184 by lovetox at 2022-07-24T17:16:42+02:00 Add empty page to controlstack - - - - - 1fae1045 by wurstsalat at 2022-07-24T17:16:42+02:00 GroupChatInviter: Set size request - - - - - 509e88ca by wurstsalat at 2022-07-24T17:16:42+02:00 Add captcha and password widgets - - - - - d1a5c3df by wurstsalat at 2022-07-24T17:16:42+02:00 MUCData: Store error and error text - - - - - 1fa4fe40 by wurstsalat at 2022-07-24T17:16:42+02:00 Move captcha and captcha-error pages to ChatFunctionPage - - - - - 77855f2e by wurstsalat at 2022-07-24T17:16:42+02:00 GroupchatControl: Move password and error pages - - - - - 70579477 by wurstsalat at 2022-07-24T17:16:42+02:00 Controls: Remove delegate_action - - - - - 15ca6f65 by wurstsalat at 2022-07-24T17:16:42+02:00 ChatStack: Process escape press - - - - - 1a2f18dc by wurstsalat at 2022-07-24T17:16:42+02:00 Fix linting errors - - - - - 4e5955e5 by wurstsalat at 2022-07-24T17:16:42+02:00 GroupChatNickCompletion: Process gc messages - - - - - 0edc1dee by lovetox at 2022-07-24T17:16:42+02:00 Make password join work - - - - - 08b062bf by wurstsalat at 2022-07-24T17:16:42+02:00 Close chat when cancelling password prompt - - - - - 32ebb410 by wurstsalat at 2022-07-24T17:16:42+02:00 GroupchatState: Connect to contact - - - - - 2b342bdf by wurstsalat at 2022-07-24T17:16:42+02:00 ChatFunctionPage: Set input visibility for password - - - - - 82edf576 by wurstsalat at 2022-07-24T17:16:42+02:00 GroupchatState: Fix indentation - - - - - faa27f83 by wurstsalat at 2022-07-24T17:16:42+02:00 Types: Use python’s integrated types - - - - - b0a9d08f by wurstsalat at 2022-07-24T17:16:42+02:00 PrivateChatControl: Remove unused code - - - - - 1ba35540 by wurstsalat at 2022-07-24T17:16:42+02:00 Controls: Typing - - - - - cd1dc84b by wurstsalat at 2022-07-24T17:16:42+02:00 MessageInputTextView: Remove 'correcting' class after sending message - - - - - 2bf2ef0e by wurstsalat at 2022-07-24T17:16:42+02:00 Fix message correction - - - - - 607eaa7c by wurstsalat at 2022-07-24T17:16:42+02:00 Remove scroll history and save_message remnants - - - - - 591ae1f1 by wurstsalat at 2022-07-24T17:16:42+02:00 Settings: Add type annotations for bind_signal - - - - - 4e940345 by wurstsalat at 2022-07-24T17:16:42+02:00 Hotkeys: Cleanup - - - - - 4f6117e5 by wurstsalat at 2022-07-24T17:16:42+02:00 MessageInputTextView: Clear undo list when clearing input - - - - - 7aa8aa81 by wurstsalat at 2022-07-24T17:16:42+02:00 fix: Preserve primary clipboard throughout switching chats - - - - - c323afda by wurstsalat at 2022-07-24T17:16:42+02:00 Main Window: Unify height of topmost widgets - - - - - 30 changed files: - .githooks/update - .gitlab-ci.yml - .gitlab/issue_templates/Release.md - CONTRIBUTING.md - ChangeLog - README.md - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/command_system/implementation/middleware.py - gajim/common/app.py - gajim/common/application.py - gajim/common/cert_store.py - gajim/common/client.py - gajim/common/const.py - gajim/common/dbus/remote_control.py - gajim/common/events.py - gajim/common/exceptions.py - gajim/common/file_props.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/idle.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/common/jingle_transport.py - gajim/common/jingle_xtls.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d174f13ee6138de1b9f9eaaa8475ad4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d174f13ee6138de1b9f9eaaa8475ad4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Settings migration: Don’t fail on missing proxies key
by Daniel Brötzmann (＠wurstsalat) 24 Jul '22

24 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 018ebe9e by wurstsalat at 2022-07-24T16:22:37+02:00 fix: Settings migration: Don’t fail on missing proxies key Fixes #11050 - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== @@ -200,7 +200,8 @@ def update_config_to_1193(self): def update_config_to_1194(self): # Delete all BOSH proxies - for name in self.old_values['proxies']: + proxies = self.old_values.get('proxies', []) + for name in proxies: if self.old_values['proxies'][name]['type'] == 'bosh': app.config.del_per('proxies', name) for account in self.old_values['accounts']: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/018ebe9e91f1b2ecec39ee2de6180639… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/018ebe9e91f1b2ecec39ee2de6180639… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Use single quotes
by Philipp Hörist (＠lovetox) 24 Jul '22

24 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: b0fbea24 by lovetox at 2022-07-24T14:49:01+02:00 refactor: Use single quotes - - - - - 30 changed files: - gajim/common/app.py - gajim/common/application.py - gajim/common/cert_store.py - gajim/common/client.py - gajim/common/const.py - gajim/common/dbus/remote_control.py - gajim/common/exceptions.py - gajim/common/file_props.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/idle.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/common/jingle_transport.py - gajim/common/jingle_xtls.py - gajim/common/logging_helpers.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/bytestream.py - gajim/common/modules/httpupload.py - gajim/common/modules/jingle.py - gajim/common/passwords.py - gajim/common/preview.py - gajim/common/proxy65_manager.py - gajim/common/regex.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/storage/archive.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0fbea240d0722c8fa5a1515ff327384… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0fbea240d0722c8fa5a1515ff327384… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Chat Markers: Don’t send marker for outgoing messages
by Daniel Brötzmann (＠wurstsalat) 24 Jul '22

24 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1514beca by wurstsalat at 2022-07-24T12:41:46+02:00 fix: Chat Markers: Don’t send marker for outgoing messages Fixes #11043 - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1134,7 +1134,7 @@ def add_message(self, else: self._jump_to_end_button.add_unread_count() - if message_id: + if message_id and kind == 'incoming': if self.is_groupchat: self.last_msg_id = stanza_id or message_id else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1514becae21286a3763927d9f24b2585… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1514becae21286a3763927d9f24b2585… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Main Window: Use restore_main_window_position
by Daniel Brötzmann (＠wurstsalat) 24 Jul '22

24 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 059680f4 by wurstsalat at 2022-07-24T12:27:56+02:00 fix: Main Window: Use restore_main_window_position - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -54,7 +54,6 @@ from .builder import get_builder from .util import get_app_window from .util import get_key_theme -from .util import move_window from .util import resize_window from .util import restore_main_window_position from .util import save_main_window_position @@ -189,13 +188,9 @@ def _prepare_window(self) -> None: window_width = app.settings.get('mainwin_width') window_height = app.settings.get('mainwin_height') resize_window(self, window_width, window_height) + restore_main_window_position() self.set_skip_taskbar_hint(not app.settings.get('show_in_taskbar')) - - x_pos = app.settings.get('mainwin_x_position') - y_pos = app.settings.get('mainwin_y_position') - move_window(self, x_pos, y_pos) - self.show_all() show_main_window = app.settings.get('show_main_window_on_startup') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/059680f443cc0897d4c84ff5133098e3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/059680f443cc0897d4c84ff5133098e3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: refactor: Remove redundant unicode string prefix
by Philipp Hörist (＠lovetox) 24 Jul '22

24 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ad41c9c by lovetox at 2022-07-24T10:41:04+02:00 refactor: Remove redundant unicode string prefix This is only needed for python2 compat - - - - - 2242a9d8 by lovetox at 2022-07-24T10:48:33+02:00 refactor: Make credit constants lists - - - - - 81f3d555 by lovetox at 2022-07-24T10:59:33+02:00 refactor: Use single quotes - - - - - 6b5db823 by lovetox at 2022-07-24T10:59:51+02:00 ci: Update flake8 config - - - - - f2f022aa by lovetox at 2022-07-24T11:01:40+02:00 chore: Add new commit prefix - - - - - 7 changed files: - .githooks/update - CONTRIBUTING.md - gajim/common/const.py - gajim/common/storage/archive.py - gajim/dev/ipython_view.py - setup.cfg - win/misc/create-launcher.py Changes: ===================================== .githooks/update ===================================== @@ -11,6 +11,7 @@ import subprocess ALLOWED_TAGS = [ 'ci', + 'cs', 'feat', 'fix', 'perf', ===================================== CONTRIBUTING.md ===================================== @@ -35,6 +35,7 @@ # Commit Messages Every commit message must be prefixed with one of the following tags: - ci (ci related changes) +- cs (code style changes) - feat (a new feature was added) - fix (something was fixed) - perf (performance related changes) ===================================== gajim/common/const.py ===================================== @@ -465,85 +465,88 @@ class CallType(Enum): CONSONANTS = 'bcdfghjklmnpqrstvwxyz' -THANKS = u"""\ -Alexander Futász -Alexander V. Butenko -Alexey Nezhdanov -Alfredo Junix -Anaël Verrier -Anders Ström -Andrew Sayman -Anton Shmigirilov -Christian Bjälevik -Christophe Got -Christoph Neuroth -David Campey -Dennis Craven -Fabian Neumann -Filippos Papadopoulos -Francisco Alburquerque Parra (Membris Khan) -Frederic Lory -Fridtjof Bussefor -Geobert Quach -Guillaume Morin -Gustavo J. A. M. Carneiro -Ivo Anjo -Josef Vybíral -Juraj Michalek -Kjell Braden -Luis Peralta -Michael Scherer -Michele Campeotto -Mike Albon -Miguel Fonseca -Norman Rasmussen -Oscar Hellström -Peter Saint-Andre -Petr Menšík -Sergey Kuleshov -Stavros Giannouris -Stian B. Barmen -Thilo Molitor -Thomas Klein-Hitpaß -Urtzi Alfaro -Witold Kieraś -Yakov Bezrukov -Yavor Doganov -""".strip().split("\n") - -ARTISTS = u"""\ -Anders Ström -Christophe Got -Dennis Craven -Dmitry Korzhevin -Guillaume Morin -Gvorcek Spajreh -Josef Vybíral -Membris Khan -Rederick Asher -Jakub Szypulka -""".strip().split("\n") - -DEVS_CURRENT = u"""\ -Yann Leboulanger (asterix AT lagaule.org) -Philipp Hörist (philipp AT hoerist.com) -Daniel Brötzmann (wurstsalat AT posteo.de) -André Apitzsch -""".strip().split("\n") - -DEVS_PAST = u"""\ -Stefan Bethge (stefan AT lanpartei.de) -Alexander Cherniuk (ts33kr AT gmail.com) -Stephan Erb (steve-e AT h3c.de) -Vincent Hanquez (tab AT snarc.org) -Dimitur Kirov (dkirov AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) -Julien Pivotto (roidelapluie AT gmail.com) -Jonathan Schleifer (js-gajim AT webkeks.org) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org) -""".strip().split("\n") +THANKS = [ + 'Alexander Futász', + 'Alexander V. Butenko', + 'Alexey Nezhdanov', + 'Alfredo Junix', + 'Anaël Verrier', + 'Anders Ström', + 'Andrew Sayman', + 'Anton Shmigirilov', + 'Christian Bjälevik', + 'Christophe Got', + 'Christoph Neuroth', + 'David Campey', + 'Dennis Craven', + 'Fabian Neumann', + 'Filippos Papadopoulos', + 'Francisco Alburquerque Parra (Membris Khan)', + 'Frederic Lory', + 'Fridtjof Bussefor', + 'Geobert Quach', + 'Guillaume Morin', + 'Gustavo J. A. M. Carneiro', + 'Ivo Anjo', + 'Josef Vybíral', + 'Juraj Michalek', + 'Kjell Braden', + 'Luis Peralta', + 'Michael Scherer', + 'Michele Campeotto', + 'Mike Albon', + 'Miguel Fonseca', + 'Norman Rasmussen', + 'Oscar Hellström', + 'Peter Saint-Andre', + 'Petr Menšík', + 'Sergey Kuleshov', + 'Stavros Giannouris', + 'Stian B. Barmen', + 'Thilo Molitor', + 'Thomas Klein-Hitpaß', + 'Urtzi Alfaro', + 'Witold Kieraś', + 'Yakov Bezrukov', + 'Yavor Doganov', +] + + +ARTISTS = [ + 'Anders Ström', + 'Christophe Got', + 'Dennis Craven', + 'Dmitry Korzhevin', + 'Guillaume Morin', + 'Gvorcek Spajreh', + 'Josef Vybíral', + 'Membris Khan', + 'Rederick Asher', + 'Jakub Szypulka', +] + + +DEVS_CURRENT = [ + 'Yann Leboulanger (asterix AT lagaule.org)', + 'Philipp Hörist (philipp AT hoerist.com)', + 'Daniel Brötzmann (wurstsalat AT posteo.de)', + 'André Apitzsch', +] + + +DEVS_PAST = [ + 'Stefan Bethge (stefan AT lanpartei.de)', + 'Alexander Cherniuk (ts33kr AT gmail.com)', + 'Stephan Erb (steve-e AT h3c.de)', + 'Vincent Hanquez (tab AT snarc.org)', + 'Dimitur Kirov (dkirov AT gmail.com)', + 'Nikos Kouremenos (kourem AT gmail.com)', + 'Julien Pivotto (roidelapluie AT gmail.com)', + 'Jonathan Schleifer (js-gajim AT webkeks.org)', + 'Travis Shirk (travis AT pobox.com)', + 'Brendan Taylor (whateley AT gmail.com)', + 'Jean-Marie Traissard (jim AT lapin.org)', +] RFC5646_LANGUAGE_TAGS = { ===================================== gajim/common/storage/archive.py ===================================== @@ -177,8 +177,8 @@ def init(self, **kwargs: Any) -> None: self._con.row_factory = self._namedtuple_factory - self._con.create_function("like", 1, self._like) - self._con.create_function("get_timeout", 0, self._get_timeout) + self._con.create_function('like', 1, self._like) + self._con.create_function('get_timeout', 0, self._get_timeout) self._get_jid_ids_from_db() @@ -188,7 +188,7 @@ def _namedtuple_factory(self, assert cursor.description is not None fields = [col[0] for col in cursor.description] - Row = namedtuple("Row", fields) # type: ignore + Row = namedtuple('Row', fields) # type: ignore named_row = Row(*row) if 'additional_data' in fields: _dict = json.loads(named_row.additional_data or '{}') @@ -259,9 +259,9 @@ def _migrate(self) -> None: @staticmethod def _get_timeout() -> int: - """ + ''' returns the timeout in epoch - """ + ''' timeout = app.settings.get('restore_timeout') now = int(time.time()) @@ -275,9 +275,9 @@ def _like(search_str: str) -> str: @timeit def _get_jid_ids_from_db(self) -> None: - """ + ''' Load all jid/jid_id tuples into a dict for faster access - """ + ''' rows = self._con.execute( 'SELECT jid_id, jid, type FROM jids').fetchall() for row in rows: @@ -310,7 +310,7 @@ def get_jid_id(self, kind: Optional[KindConstant] = None, type_: Optional[JIDConstant] = None ) -> int: - """ + ''' Get the jid id from a jid. In case the jid id is not found create a new one. @@ -321,7 +321,7 @@ def get_jid_id(self, :param type_: The JIDConstant return the jid id - """ + ''' if kind in (KindConstant.GC_MSG, KindConstant.GCSTATUS): type_ = JIDConstant.ROOM_TYPE @@ -354,9 +354,9 @@ def get_jid_id(self, @staticmethod def convert_show_values_to_db_api_values(show: Optional[str] ) -> Optional[ShowConstant]: - """ + ''' Convert from string style to constant ints for db - """ + ''' if show == 'online': return ShowConstant.ONLINE @@ -384,7 +384,7 @@ def get_conversation_before_after(self, timestamp: float, n_lines: int ) -> list[ConversationRow]: - """ + ''' Load n_lines lines of conversation with jid before or after timestamp :param account: The account @@ -396,7 +396,7 @@ def get_conversation_before_after(self, :param timestamp: timestamp returns a list of namedtuples - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.ERROR, @@ -431,7 +431,7 @@ def get_last_conversation_line(self, account: str, jid: JID ) -> LastConversationRow: - """ + ''' Load the last line of a conversation with jid for account. Loads messages, but no status messages or error messages. @@ -440,7 +440,7 @@ def get_last_conversation_line(self, :param jid: The jid for which we request the conversation returns a list of namedtuples - """ + ''' jids = [jid] account_id = self.get_account_id(account) @@ -468,7 +468,7 @@ def get_conversation_around(self, timestamp: float ) -> tuple[list[ConversationRow], list[ConversationRow]]: - """ + ''' Load all lines of conversation with jid around a specific timestamp :param account: The account @@ -478,7 +478,7 @@ def get_conversation_around(self, :param timestamp: Timestamp around which to fetch messages returns a list of namedtuples - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.ERROR]) @@ -526,7 +526,7 @@ def get_conversation_between(self, jid: str, before: float, after: float) -> list[ConversationRow]: - """ + ''' Load all lines of conversation with jid between two timestamps :param account: The account @@ -538,7 +538,7 @@ def get_conversation_between(self, :param after: earliest timestamp returns a list of namedtuples - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.ERROR]) @@ -570,7 +570,7 @@ def search_log(self, before: Optional[datetime.datetime] = None, after: Optional[datetime.datetime] = None ) -> Iterator[SearchLogRow]: - """ + ''' Search the conversation log for messages containing the `query` string. The search can either span the complete log for the given @@ -590,7 +590,7 @@ def search_log(self, :param after: A datetime.datetime instance or None returns a list of namedtuples - """ + ''' jids = [jid] kinds = map(str, [KindConstant.STATUS, @@ -654,7 +654,7 @@ def search_all_logs(self, before: Optional[datetime.datetime] = None, after: Optional[datetime.datetime] = None ) -> Iterator[SearchLogRow]: - """ + ''' Search all conversation logs for messages containing the `query` string. @@ -667,7 +667,7 @@ def search_all_logs(self, :param after: A datetime.datetime instance or None returns a list of namedtuples - """ + ''' account_ids = self.get_active_account_ids() kinds = map(str, [KindConstant.STATUS, KindConstant.GCSTATUS]) @@ -726,9 +726,9 @@ def get_days_with_history(self, year: int, month: int ) -> list[HistoryDayRow]: - """ + ''' Get days in month where messages for 'jid' exist - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.STATUS, @@ -740,7 +740,7 @@ def get_days_with_history(self, delta = datetime.timedelta( days=days, hours=23, minutes=59, seconds=59, microseconds=999999) - sql = """ + sql = ''' SELECT DISTINCT CAST(strftime('%d', time, 'unixepoch', 'localtime') AS INTEGER) AS day FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) @@ -748,7 +748,7 @@ def get_days_with_history(self, AND time BETWEEN ? AND ? AND kind NOT IN ({kinds}) ORDER BY time - """.format(jids=', '.join('?' * len(jids)), + '''.format(jids=', '.join('?' * len(jids)), account_id=account_id, kinds=', '.join(kinds)) @@ -762,9 +762,9 @@ def get_last_history_timestamp(self, account: str, jid: str ) -> Optional[float]: - """ + ''' Get the timestamp of the last message we received for the jid - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.STATUS, @@ -788,9 +788,9 @@ def get_first_history_timestamp(self, account: str, jid: str ) -> Optional[float]: - """ + ''' Get the timestamp of the first message we received for the jid - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.STATUS, @@ -815,10 +815,10 @@ def date_has_history(self, jid: str, date: datetime.datetime ) -> Optional[float]: - """ + ''' Get a single timestamp of a message for 'jid' in time range of one day - """ + ''' jids = [jid] account_id = self.get_account_id(account) delta = datetime.timedelta( @@ -844,9 +844,9 @@ def get_first_message_meta_for_date(self, jid: str, date: datetime.datetime ) -> Optional[MessageMetaRow]: - """ + ''' Load meta data for the first message of a specific date - """ + ''' jids = [jid] account_id = self.get_account_id(account) @@ -876,7 +876,7 @@ def deduplicate_muc_message(self, timestamp: float, message_id: str ) -> bool: - """ + ''' Check if a message is already in the `logs` table :param account: The account @@ -888,7 +888,7 @@ def deduplicate_muc_message(self, :param timestamp: The timestamp in UTC epoch :param message_id: The message-id - """ + ''' # Add 60 seconds around the timestamp start_time = timestamp - 60 @@ -929,7 +929,7 @@ def find_stanza_id(self, origin_id: Optional[str] = None, groupchat: bool = False ) -> bool: - """ + ''' Checks if a stanza-id is already in the `logs` table :param account: The account @@ -944,7 +944,7 @@ def find_stanza_id(self, :param groupchat: stanza-id is from a groupchat return True if the stanza-id was found - """ + ''' ids: list[str] = [] if stanza_id is not None: ids.append(stanza_id) @@ -1122,7 +1122,7 @@ def insert_jid(self, kind: Optional[KindConstant] = None, type_: JIDConstant = JIDConstant.NORMAL_TYPE ) -> int: - """ + ''' Insert a new jid into the `jids` table. This is an alias of get_jid_id() for better readablility. @@ -1131,7 +1131,7 @@ def insert_jid(self, :param kind: A KindConstant :param type_: A JIDConstant - """ + ''' return self.get_jid_id(jid, kind, type_) @timeit @@ -1142,7 +1142,7 @@ def insert_into_logs(self, kind: KindConstant, **kwargs: Any ) -> int: - """ + ''' Insert a new message into the `logs` table :param jid: The jid as string @@ -1156,7 +1156,7 @@ def insert_into_logs(self, :param kwargs: Every additional named argument must correspond to a field in the `logs` table - """ + ''' jid_id = self.get_jid_id(jid, kind=kind) account_id = self.get_account_id(account) @@ -1193,7 +1193,7 @@ def set_message_error(self, message_id: str, error: str ) -> None: - """ + ''' Update the corresponding message with the error :param account_jid: The jid of the account @@ -1204,7 +1204,7 @@ def set_message_error(self, :param error: The error stanza as string - """ + ''' account_id = self.get_jid_id(account_jid) try: @@ -1227,7 +1227,7 @@ def set_marker(self, message_id: str, state: str ) -> None: - """ + ''' Update the marker state of the corresponding message :param account_jid: The jid of the account @@ -1238,7 +1238,7 @@ def set_marker(self, :param state: The state, 'received' or 'displayed' - """ + ''' if state not in ('received', 'displayed'): raise ValueError('Invalid marker state') @@ -1260,19 +1260,19 @@ def set_marker(self, @timeit def get_archive_infos(self, jid: str) -> Optional[LastArchiveMessageRow]: - """ + ''' Get the archive infos :param jid: The jid that belongs to the avatar - """ + ''' jid_id = self.get_jid_id(jid, type_=JIDConstant.ROOM_TYPE) sql = '''SELECT * FROM last_archive_message WHERE jid_id = ?''' return self._con.execute(sql, (jid_id,)).fetchone() @timeit def set_archive_infos(self, jid: str, **kwargs: Any) -> None: - """ + ''' Set archive infos :param jid: The jid that belongs to the avatar @@ -1288,7 +1288,7 @@ def set_archive_infos(self, jid: str, **kwargs: Any) -> None: :param sync_threshold: The max days that we request from a MUC archive - """ + ''' jid_id = self.get_jid_id(jid) exists = self.get_archive_infos(jid) if not exists: @@ -1316,12 +1316,12 @@ def set_archive_infos(self, jid: str, **kwargs: Any) -> None: @timeit def reset_archive_infos(self, jid: str) -> None: - """ + ''' Set archive infos :param jid: The jid of the archive - """ + ''' jid_id = self.get_jid_id(jid) sql = '''UPDATE last_archive_message SET last_mam_id = NULL, oldest_mam_timestamp = NULL, @@ -1366,10 +1366,10 @@ def get_messages_for_export(self, yield result def remove_history(self, account: str, jid: JID) -> None: - """ + ''' Remove history for a specific chat. If it's a group chat, remove last MAM ID as well. - """ + ''' account_id = self.get_account_id(account) try: jid_id = self.get_jid_id(jid) @@ -1383,9 +1383,9 @@ def remove_history(self, account: str, jid: JID) -> None: log.info('Removed history for: %s', jid) def remove_all_history(self) -> None: - """ + ''' Remove all messages for all accounts - """ + ''' statements = [ 'DELETE FROM logs', 'DELETE FROM jids', @@ -1395,9 +1395,9 @@ def remove_all_history(self) -> None: log.info('Removed all chat history') def cleanup_chat_history(self) -> None: - """ + ''' Remove messages from account where messages are older than max_age - """ + ''' for account in app.settings.get_accounts(): max_age = app.settings.get_account_setting( account, 'chat_history_max_age') ===================================== gajim/dev/ipython_view.py ===================================== @@ -43,7 +43,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -""" +''' Provides IPython console widget @author: Eitan Isaacson @@ -54,7 +54,7 @@ All rights reserved. This program and the accompanying materials are made available under the terms of the BSD which accompanies this distribution, and is available at U{http://www.opensource.org/licenses/bsd-license.php} -""" +''' import re import sys @@ -87,7 +87,7 @@ def write_output_prompt(self): class IterableIPShell: - """ + ''' Create an IPython instance. Does not start a blocking event loop, instead allow single iterations. This allows embedding in GTK without blockage @@ -102,10 +102,10 @@ class IterableIPShell: @type history_level: integer @ivar complete_sep: Separation delimiters for completion function. @type complete_sep: _sre.SRE_Pattern - """ + ''' def __init__(self, argv=None, user_ns=None, user_global_ns=None, cin=None, cout=None, cerr=None, input_func=None): - """ + ''' @param argv: Command line options for IPython @type argv: list @param user_ns: User namespace. @@ -120,7 +120,7 @@ def __init__(self, argv=None, user_ns=None, user_global_ns=None, cin=None, @type cerr: IO stream @param input_func: Replacement for builtin raw_input() @type input_func: function - """ + ''' if argv is None: argv = [] @@ -138,7 +138,7 @@ def __init__(self, argv=None, user_ns=None, user_global_ns=None, cin=None, from traitlets.config.loader import Config cfg = Config() - cfg.InteractiveShell.colors = "Linux" + cfg.InteractiveShell.colors = 'Linux' # InteractiveShell's __init__ gets a reference of stdout and stderr # so we save the standard here to revert it after init @@ -178,9 +178,9 @@ def __update_namespace(self): self.IP.user_ns.update({k: v}) def execute(self): - """ + ''' Execute the current line provided by the shell object - """ + ''' self.history_level = 0 orig_stdout = sys.stdout sys.stdout = IPython.utils.io.stdout @@ -237,37 +237,37 @@ def generatePrompt(self, is_continuation): ''' # TODO: Update to IPython 5.x and later - prompt = "In [%d]: " % self.IP.execution_count + prompt = 'In [%d]: ' % self.IP.execution_count return prompt def historyBack(self): - """ + ''' Provide one history command back @return: The command string. @rtype: string - """ + ''' self.history_level -= 1 return self._getHistory() def historyForward(self): - """ + ''' Provide one history command forward @return: The command string. @rtype: string - """ + ''' self.history_level += 1 return self._getHistory() def _getHistory(self): - """ + ''' Get the command string of the current history level @return: Historic command string. @rtype: string - """ + ''' try: rv = self.IP.user_ns['In'][self.history_level].strip('\n') except IndexError: @@ -276,16 +276,16 @@ def _getHistory(self): return rv def updateNamespace(self, ns_dict): - """ + ''' Add the current dictionary to the shell namespace @param ns_dict: A dictionary of symbol-values. @type ns_dict: dictionary - """ + ''' self.IP.user_ns.update(ns_dict) def complete(self, line): - """ + ''' Returns an auto completed line and/or possibilities for completion @param line: Given line so far. @@ -294,7 +294,7 @@ def complete(self, line): @return: Line completed as for as possible, and possible further completions. @rtype: tuple - """ + ''' split_line = self.complete_sep.split(line) if split_line[-1]: possibilities = self.IP.complete(split_line[-1]) @@ -331,7 +331,7 @@ def _commonPrefix(str1, str2): class ConsoleView(Gtk.TextView): - """ + ''' Specialized text view for console-like workflow @cvar ANSI_COLORS: Mapping of terminal colors to X11 names. @@ -345,7 +345,7 @@ class ConsoleView(Gtk.TextView): @type mark: Gtk.TextMark @ivar line_start: Start of command line mark. @type line_start: Gtk.TextMark - """ + ''' ANSI_COLORS = {'0;30': 'Black', '0;31': 'Red', '0;32': 'Green', '0;33': 'Brown', @@ -357,9 +357,9 @@ class ConsoleView(Gtk.TextView): '1;36': 'LightCyan', '1;37': 'White'} def __init__(self): - """ + ''' Initialize console view - """ + ''' GObject.GObject.__init__(self) self.override_font(Pango.FontDescription('Mono')) self.set_cursor_visible(True) @@ -396,14 +396,14 @@ def write(self, text, editable=False): GLib.idle_add(self._write5, text, editable) def _write5(self, text, editable=False): - """ + ''' Write given text to buffer @param text: Text to append. @type text: list of (token: string) @param editable: If true, added text is editable. @type editable: boolean - """ + ''' start_mark = self.text_buffer.create_mark( None, self.text_buffer.get_end_iter(), True) @@ -420,14 +420,14 @@ def _write5(self, text, editable=False): self.scroll_mark_onscreen(self.mark) def _write(self, text, editable=False): - """ + ''' Write given text to buffer @param text: Text to append. @type text: string @param editable: If true, added text is editable. @type editable: boolean - """ + ''' if isinstance(text, list): self._write5(text, editable) return @@ -457,12 +457,12 @@ def showPrompt(self, prompt): GLib.idle_add(self._showPrompt, prompt) def _showPrompt(self, prompt): - """ + ''' Print prompt at start of line @param prompt: Prompt to print. @type prompt: string - """ + ''' self._write(prompt) self.text_buffer.move_mark(self.line_start, self.text_buffer.get_end_iter()) @@ -471,12 +471,12 @@ def changeLine(self, text): GLib.idle_add(self._changeLine, text) def _changeLine(self, text): - """ + ''' Replace currently entered command line with given text @param text: Text to use as replacement. @type text: string - """ + ''' iter_ = self.text_buffer.get_iter_at_mark(self.line_start) iter_.forward_to_line_end() self.text_buffer.delete( @@ -484,12 +484,12 @@ def _changeLine(self, text): self._write(text, True) def getCurrentLine(self): - """ + ''' Get text in current command line @return: Text of current command line. @rtype: string - """ + ''' rv = self.text_buffer.get_slice( self.text_buffer.get_iter_at_mark(self.line_start), self.text_buffer.get_end_iter(), False) @@ -499,12 +499,12 @@ def showReturned(self, text): GLib.idle_add(self._showReturned, text) def _showReturned(self, text): - """ + ''' Show returned text from last command and print new prompt @param text: Text to show. @type text: string - """ + ''' iter_ = self.text_buffer.get_iter_at_mark(self.line_start) iter_.forward_to_line_end() self.text_buffer.apply_tag_by_name( @@ -524,7 +524,7 @@ def _showReturned(self, text): self.text_buffer.insert_at_cursor(indentation) def onKeyPress(self, _widget, event): - """ + ''' Key press callback used for correcting behavior for console-like interfaces. For example 'home' should go to prompt, not to beginning of line @@ -536,7 +536,7 @@ def onKeyPress(self, _widget, event): @return: Return True if event should not trickle. @rtype: boolean - """ + ''' insert_mark = self.text_buffer.get_insert() insert_iter = self.text_buffer.get_iter_at_mark(insert_mark) selection_mark = self.text_buffer.get_selection_bound() @@ -570,9 +570,9 @@ def onKeyPress(self, _widget, event): return self.onKeyPressExtend(event) def onKeyPressExtend(self, event): - """ + ''' For some reason we can't extend onKeyPress directly (bug #500900) - """ + ''' class IPythonView(ConsoleView, IterableIPShell): @@ -581,9 +581,9 @@ class IPythonView(ConsoleView, IterableIPShell): a GTK IPython console. ''' def __init__(self): - """ + ''' Initialize. Redirect I/O to console - """ + ''' ConsoleView.__init__(self) self.cout = StringIO() IterableIPShell.__init__(self, cout=self.cout, cerr=self.cout, @@ -604,7 +604,7 @@ def prompt_for_code(self): return self.raw_input(self) def raw_input(self, _prompt=''): - """ + ''' Custom raw_input() replacement. Gets current line from console buffer @param prompt: Prompt to print. Here for compatibility as replacement. @@ -612,14 +612,14 @@ def raw_input(self, _prompt=''): @return: The current command line text. @rtype: string - """ + ''' if self.interrupt: self.interrupt = False raise KeyboardInterrupt return self.getCurrentLine() def onKeyPressExtend(self, event): - """ + ''' Key press callback with plenty of shell goodness, like history, autocompletions, etc @@ -630,7 +630,7 @@ def onKeyPressExtend(self, event): @return: True if event should not trickle. @rtype: boolean - """ + ''' if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.keyval == 99): self.interrupt = True @@ -659,9 +659,9 @@ def onKeyPressExtend(self, event): return True def _processLine(self): - """ + ''' Process current command line - """ + ''' self.history_pos = 0 self.execute() rv = self.cout.getvalue() ===================================== setup.cfg ===================================== @@ -18,6 +18,10 @@ max-line-length = 80 statistics = True count = True +inline-quotes = single +multiline-quotes = ''' +docstring-quotes = ''' + [metadata] name = gajim version = attr: gajim.__version__ ===================================== win/misc/create-launcher.py ===================================== @@ -7,10 +7,10 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -"""Creates simple Python .exe launchers for gui and cli apps +# Creates simple Python .exe launchers for gui and cli apps +# +# ./create-launcher.py "1.4.0" <target-dir> -./create-launcher.py "1.4.0" <target-dir> -""" import os import sys @@ -22,26 +22,26 @@ def build_resource(rc_path: str, out_path: str) -> None: - """Raises subprocess.CalledProcessError""" + '''Raises subprocess.CalledProcessError''' def is_64bit(): - return struct.calcsize("P") == 8 + return struct.calcsize('P') == 8 subprocess.check_call( - ["windres", "-O", "coff", "-F", - "pe-x86-64" if is_64bit() else "pe-i386", rc_path, - "-o", out_path]) + ['windres', '-O', 'coff', '-F', + 'pe-x86-64' if is_64bit() else 'pe-i386', rc_path, + '-o', out_path]) def get_build_args() -> list[str]: python_name = os.path.splitext(os.path.basename(sys.executable))[0] python_config = os.path.join( - os.path.dirname(sys.executable), python_name + "-config") + os.path.dirname(sys.executable), python_name + '-config') cflags = subprocess.check_output( - ["sh", python_config, "--cflags"]).strip() + ['sh', python_config, '--cflags']).strip() libs = subprocess.check_output( - ["sh", python_config, "--libs"]).strip() + ['sh', python_config, '--libs']).strip() cflags = os.fsdecode(cflags) libs = os.fsdecode(libs) @@ -53,16 +53,16 @@ def build_exe(source_path: str, is_gui: bool, out_path: str) -> None: - args = ["gcc", "-s"] + args = ['gcc', '-s'] if is_gui: - args.append("-mwindows") - args.extend(["-o", out_path, source_path, resource_path]) + args.append('-mwindows') + args.extend(['-o', out_path, source_path, resource_path]) args.extend(get_build_args()) subprocess.check_call(args) def get_launcher_code(debug: bool) -> str: - template = """\ + template = '''\ #include "Python.h" #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -102,7 +102,7 @@ def get_launcher_code(debug: bool) -> str: Py_Finalize(); return result; } - """ % int(debug) + ''' % int(debug) return template @@ -115,7 +115,7 @@ def get_resouce_code(filename: str, product_version: str, company_name: str) -> str: - template = """\ + template = '''\ 1 ICON "%(icon_path)s" 1 VERSIONINFO FILEVERSION %(file_version_list)s @@ -141,22 +141,22 @@ def get_resouce_code(filename: str, VALUE "Translation", 0x409, 1252 END END -""" +''' def to_ver_list(v: str) -> str: - v = v.split("-")[0] - return ",".join(map(str, (list(map(int, v.split("."))) + [0] * 4)[:4])) + v = v.split('-')[0] + return ','.join(map(str, (list(map(int, v.split('.'))) + [0] * 4)[:4])) file_version_list = to_ver_list(file_version) product_version_list = to_ver_list(product_version) return template % { - "icon_path": icon_path, "file_version_list": file_version_list, - "product_version_list": product_version_list, - "file_version": file_version, "product_version": product_version, - "company_name": company_name, "filename": filename, - "internal_name": os.path.splitext(filename)[0], - "product_name": product_name, "file_desc": file_desc, + 'icon_path': icon_path, 'file_version_list': file_version_list, + 'product_version_list': product_version_list, + 'file_version': file_version, 'product_version': product_version, + 'company_name': company_name, 'filename': filename, + 'internal_name': os.path.splitext(filename)[0], + 'product_name': product_name, 'file_desc': file_desc, } @@ -178,16 +178,16 @@ def build_launcher(out_path: str, temp = tempfile.mkdtemp() try: os.chdir(temp) - with open("launcher.c", "w") as h: + with open('launcher.c', 'w') as h: h.write(get_launcher_code(debug)) - shutil.copyfile(src_ico, "launcher.ico") - with open("launcher.rc", "w") as h: + shutil.copyfile(src_ico, 'launcher.ico') + with open('launcher.rc', 'w') as h: h.write(get_resouce_code( os.path.basename(target), file_version, file_desc, - "launcher.ico", product_name, product_version, company_name)) + 'launcher.ico', product_name, product_version, company_name)) - build_resource("launcher.rc", "launcher.res") - build_exe("launcher.c", "launcher.res", is_gui, target) + build_resource('launcher.rc', 'launcher.res') + build_exe('launcher.c', 'launcher.res', is_gui, target) finally: os.chdir(dir_) shutil.rmtree(temp) @@ -199,17 +199,17 @@ def main() -> None: version = argv[1] target = argv[2] - company_name = "Gajim" + company_name = 'Gajim' misc = os.path.dirname(os.path.realpath(__file__)) build_launcher( - os.path.join(target, "Gajim.exe"), - os.path.join(misc, "gajim.ico"), "Gajim", "Gajim", + os.path.join(target, 'Gajim.exe'), + os.path.join(misc, 'gajim.ico'), 'Gajim', 'Gajim', version, company_name, True) build_launcher( - os.path.join(target, "Gajim-Debug.exe"), - os.path.join(misc, "gajim.ico"), "Gajim", "Gajim", + os.path.join(target, 'Gajim-Debug.exe'), + os.path.join(misc, 'gajim.ico'), 'Gajim', 'Gajim', version, company_name, False, debug=True) # build_launcher( @@ -218,5 +218,5 @@ def main() -> None: # version, company_name, 'history_manager.py', True) -if __name__ == "__main__": +if __name__ == '__main__': main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cc5d3ffa6acb514ec4ecc86c741efd7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cc5d3ffa6acb514ec4ecc86c741efd7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Main Window: Move to stored position on startup
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cc5d3ffa by wurstsalat at 2022-07-23T22:56:32+02:00 fix: Main Window: Move to stored position on startup - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -54,6 +54,7 @@ from .builder import get_builder from .util import get_app_window from .util import get_key_theme +from .util import move_window from .util import resize_window from .util import restore_main_window_position from .util import save_main_window_position @@ -191,6 +192,10 @@ def _prepare_window(self) -> None: self.set_skip_taskbar_hint(not app.settings.get('show_in_taskbar')) + x_pos = app.settings.get('mainwin_x_position') + y_pos = app.settings.get('mainwin_y_position') + move_window(self, x_pos, y_pos) + self.show_all() show_main_window = app.settings.get('show_main_window_on_startup') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc5d3ffa6acb514ec4ecc86c741efd7a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc5d3ffa6acb514ec4ecc86c741efd7a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: ConversationView: Fix linting error
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d00dfe2e by wurstsalat at 2022-07-23T22:44:01+02:00 fix: ConversationView: Fix linting error - - - - - 3bc58246 by wurstsalat at 2022-07-23T22:44:01+02:00 imprv: Startup: Show hint in console if Gajim is already running Fixes #11039 - - - - - 2 changed files: - gajim/gtk/application.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -383,6 +383,8 @@ def _handle_local_options(self, self.register() if self.get_is_remote(): + print('Gajim is already running. ' + 'The primary instance will handle remote commands') return -1 self._core_command_line(options) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -392,7 +392,7 @@ def _reduce_messages_before(self) -> bool: row1 = self.get_row_at_index(2) row2 = self.get_row_at_index(3) - if row1.type == row2.type == 'date': + if row1.type == 'date' and row2.type == 'date': # First two rows are date rows, # it’s safe to remove the fist row row1.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4f486209083c62ca2914fee5c9f758e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4f486209083c62ca2914fee5c9f758e… 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