Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_1.2] Update appveyor.yml
by Philipp Hörist 12 Aug '20

12 Aug '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 0862be59 by lovetox at 2020-08-12T13:07:29+02:00 Update appveyor.yml - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== @@ -17,14 +17,19 @@ clone_depth: 1 # init: # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +install: + - set PATH=C:\msys64\usr\bin;%PATH% + # Download new keyring until appveyor updates its installation + - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.x…" + - bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" + - bash -lc "pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz --noconfirm" + - bash -lc "pacman --needed --noconfirm -Syu" + # This is needed because without killing all processes -Su will fail + - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process + - bash -lc "pacman --needed --noconfirm -Su" + build_script: - - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll - - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll - # Temporary fix until appveyor updates its msys build https://github.com/msys2/MINGW-packages/issues/5437 - - C:\msys64\usr\bin\pacman -Rdd mingw-w64-i686-ncurses mingw-w64-i686-termcap mingw-w64-i686-gcc-ada mingw-w64-i686-gcc-objc --noconfirm --noprogressbar - - C:\msys64\usr\bin\pacman -Rdd mingw-w64-x86_64-ncurses mingw-w64-x86_64-termcap mingw-w64-x86_64-gcc-ada mingw-w64-x86_64-gcc-objc --noconfirm --noprogressbar - - - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\* - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0862be59404556e02b5d7a5e6e2a75a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0862be59404556e02b5d7a5e6e2a75a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update appveyor.yml
by Philipp Hörist 12 Aug '20

12 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9f346966 by lovetox at 2020-08-12T12:45:22+02:00 Update appveyor.yml - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== @@ -17,14 +17,20 @@ clone_depth: 1 # init: # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +install: + - set PATH=C:\msys64\usr\bin;%PATH% + # Download new keyring until appveyor updates its installation + - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.x…" + - bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" + - bash -lc "pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz --noconfirm" + - bash -lc "pacman --needed --noconfirm -Syu" + # This is needed because without killing all processes -Su will fail + - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process + - bash -lc "pacman --needed --noconfirm -Su" + build_script: - - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll - - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll - # Temporary fix until appveyor updates its msys build https://github.com/msys2/MINGW-packages/issues/5437 - - C:\msys64\usr\bin\pacman -Rdd mingw-w64-i686-ncurses mingw-w64-i686-termcap mingw-w64-i686-gcc-ada mingw-w64-i686-gcc-objc --noconfirm --noprogressbar - - C:\msys64\usr\bin\pacman -Rdd mingw-w64-x86_64-ncurses mingw-w64-x86_64-termcap mingw-w64-x86_64-gcc-ada mingw-w64-x86_64-gcc-objc --noconfirm --noprogressbar - - - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\* + - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" @@ -41,7 +47,7 @@ build_script: # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - + deploy: # FTP deployment provider settings - provider: FTP View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9f346966d251ce8e464fd6a368df400e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9f346966d251ce8e464fd6a368df400e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Support plugins with complex dependencies, like appindicator
by André 11 Aug '20

11 Aug '20

André pushed to branch master at gajim / gajim Commits: 3aa1ad07 by André Apitzsch at 2020-08-11T22:16:11+02:00 Flatpak: Support plugins with complex dependencies, like appindicator - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -31,11 +31,13 @@ finish-args: - --device=all # extensions - --env=PYTHONPATH=/app/plugins/lib/python3.7/site-packages + - --env=GI_TYPELIB_PATH=/app/lib/girepository-1.0:/app/plugins/lib/girepository-1.0 add-extensions: org.gajim.Gajim.Devel.Plugin: directory: plugins - merge-dirs: lib/python3.7/site-packages + merge-dirs: lib + add-ld-path: lib subdirectories: true no-autodownload: true autodelete: true View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3aa1ad07b8b4d36aeaa0577342bd57a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3aa1ad07b8b4d36aeaa0577342bd57a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 39 commits: ChatControl: Fix Jingle session termination
by Philipp Hörist 11 Aug '20

11 Aug '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: c4cdf8c1 by Daniel Brötzmann at 2020-08-11T21:20:33+02:00 ChatControl: Fix Jingle session termination - - - - - e3f1046d by Daniel Brötzmann at 2020-08-11T21:20:33+02:00 Jingle A/V: Log used codec - - - - - 216fa94e by Daniel Brötzmann at 2020-08-11T21:20:33+02:00 DOAP: Update Gajim subtitle and Wiki URL - - - - - cc7c2f6a by Daniel Brötzmann at 2020-08-11T21:20:33+02:00 Appdata: Update subtitle, description and Wiki URLs - - - - - 391192b4 by Daniel Brötzmann at 2020-08-11T21:20:33+02:00 Gajim Dekstop file: Update subtitle - - - - - 04767dd0 by Daniel Brötzmann at 2020-08-11T21:20:33+02:00 Add StatusSelector with popover - - - - - 03235bb0 by wurstsalat at 2020-08-11T21:20:33+02:00 Preferences: Add checkbutton for use_keyring - - - - - 6d964b50 by wurstsalat at 2020-08-11T21:20:33+02:00 Introduce automatic update check for Gajim - - - - - 7538bd7a by lovetox at 2020-08-11T21:20:33+02:00 Preferences: Change order and visibilty of checkbuttons - Hide update check on linux - Remove Windows only tooltip - Change order of elements - - - - - 2f39c68b by Daniel Brötzmann at 2020-08-11T21:20:33+02:00 Remove show value 'chat' from status selectors - - - - - 04753617 by wurstsalat at 2020-08-11T21:20:33+02:00 PrivacyLists: Remove obsolete UI files - - - - - 7215c5f0 by wurstsalat at 2020-08-11T21:20:33+02:00 AddContactWindow: Make button strings translatable - - - - - 31cfda3d by lovetox at 2020-08-11T21:20:33+02:00 AccountWizard: Validate host and port - - - - - 5eb3e66e by lovetox at 2020-08-11T21:20:33+02:00 GroupchatRoster: Don’t fix height of rows Fixes #10201 - - - - - 5da4f5b6 by lovetox at 2020-08-11T21:20:33+02:00 Remove default status settings Presets can be used instead - - - - - 36931c50 by lovetox at 2020-08-11T21:20:33+02:00 Move should_log() into helpers module - - - - - bbfe0ff2 by lovetox at 2020-08-11T21:20:33+02:00 Move notify_for_muc() into helpers module - - - - - 65bed3e3 by lovetox at 2020-08-11T21:20:33+02:00 Don’t create zeroconf default config - - - - - b5a3a016 by lovetox at 2020-08-11T21:20:33+02:00 Remove unused code - - - - - fab96619 by lovetox at 2020-08-11T21:20:33+02:00 Remove unused code - - - - - 3360e83c by André Apitzsch at 2020-08-11T21:20:33+02:00 Fix warning 'Theme Standard not found, fallback to default' when new config is generated - - - - - fa105c6d by lovetox at 2020-08-11T21:20:33+02:00 HtmlTextview: Remove <img> support If at all this needs to be reimplemented with libsoup - - - - - 7fe7d71c by lovetox at 2020-08-11T21:20:33+02:00 Contacts: Add can_notify() method for group chats - - - - - b14db179 by lovetox at 2020-08-11T21:20:33+02:00 Preferences: Don't use get_options() This is in preparation of migrating the config module - - - - - e2556a00 by lovetox at 2020-08-11T21:20:33+02:00 Preferences: Simplify combobox code - - - - - b1fed001 by lovetox at 2020-08-11T21:20:33+02:00 Remove unused code - - - - - abe45ce7 by lovetox at 2020-08-11T21:20:33+02:00 Preferences: Simplify combobox code - - - - - 9e050133 by lovetox at 2020-08-11T21:20:33+02:00 Util: Don’t depend on config constant - - - - - c65318f7 by lovetox at 2020-08-11T21:20:33+02:00 Preferences: Don’t translate id column - - - - - f2f8c9dd by lovetox at 2020-08-11T21:20:33+02:00 Don't assume Local account will be always there - - - - - 2d2047fe by lovetox at 2020-08-11T21:20:33+02:00 Remote: Remove possibility to adjust settings via DBus - - - - - 92e9fbba by lovetox at 2020-08-11T21:20:33+02:00 Remove unused config values - - - - - eb72ce43 by André Apitzsch at 2020-08-11T21:20:33+02:00 XML console: Use better fitting clear icon - - - - - 6213ac02 by lovetox at 2020-08-11T21:20:33+02:00 MUC: Reset state after connect without resumption Fixes #10200 - - - - - 337fcebc by lovetox at 2020-08-11T21:20:33+02:00 MUC: Respect print status setting for own status changes Fixes #10192 - - - - - 03c92028 by lovetox at 2020-08-11T21:20:33+02:00 PluginManager: Show error correctly when plugin removal fails Fixes #10208 - - - - - 7b097724 by lovetox at 2020-08-11T21:20:33+02:00 Remove ability to ignore tls errors It’s complicated, error prone and people will shoot themself in the foot Because the current error dialog lets us only show one error, the only allowed tls error where a connect is still possible is EXPIRED. For UNKNOWN_CA there is still the possibility to mark the certificate as trusted, so it’s not considered a tls error on next connect. - - - - - ee645a11 by lovetox at 2020-08-11T21:20:33+02:00 Client: Don’t try to resume the stream after stream error - - - - - 65909c02 by André Apitzsch at 2020-08-11T21:20:33+02:00 CSS: Add missing delimiters - - - - - 30 changed files: - data/gajim-remote.1 - data/gajim.doap - data/org.gajim.Gajim.appdata.xml.in - data/org.gajim.Gajim.desktop.in - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/contacts.py - gajim/common/helpers.py - gajim/common/jingle_rtp.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/optparser.py - gajim/data/gui/add_new_contact_window.ui - gajim/data/gui/groupchat_roster.ui - gajim/data/gui/preferences_window.ui - − gajim/data/gui/privacy_list_window.ui - − gajim/data/gui/privacy_lists_window.ui - gajim/data/gui/roster_window.ui - gajim/data/gui/ssl_error_dialog.ui - gajim/data/gui/xml_console.ui - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/gajim_remote.py - gajim/groupchat_control.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/626de12ff3dff9a872838e66f8b111c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/626de12ff3dff9a872838e66f8b111c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CSS: Add missing delimiters
by Philipp Hörist 11 Aug '20

11 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e52b9f3e by André Apitzsch at 2020-08-11T20:32:56+02:00 CSS: Add missing delimiters - - - - - 3 changed files: - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/default-dark.css ===================================== @@ -1,54 +1,54 @@ .gajim-incoming-nickname { - color: rgb(210, 75, 75) + color: rgb(210, 75, 75); } .gajim-outgoing-nickname { - color: rgb(40, 140, 210) + color: rgb(40, 140, 210); } .gajim-outgoing-message-text { - color: rgb(200, 200, 200) + color: rgb(200, 200, 200); } .gajim-status-message { - color: rgb(140, 175, 210) + color: rgb(140, 175, 210); } .gajim-url { - color: rgb(60, 135, 220) + color: rgb(60, 135, 220); } .gajim-highlight-message { - color: rgb(210, 70, 30) + color: rgb(210, 70, 30); } .gajim-state-tab-muc-directed-msg { - color: rgb(210, 70, 30) + color: rgb(210, 70, 30); } .gajim-state-tab-muc-msg { - color: rgb(80, 95, 230) + color: rgb(80, 95, 230); } .gajim-roster-disconnected { - background: rgb(80, 30, 30) + background: rgb(80, 30, 30); } .gajim-roster-connected { - background: rgb(30, 80, 50) + background: rgb(30, 80, 50); } .gajim-state-composing { - color: rgb(90, 180, 90) + color: rgb(90, 180, 90); } .gajim-state-inactive { - color: rgb(158, 158, 158) + color: rgb(158, 158, 158); } .gajim-state-gone { - color: rgb(128, 128, 128) + color: rgb(128, 128, 128); } .gajim-state-paused { - color: rgb(20, 210, 160) + color: rgb(20, 210, 160); } .gajim-message-placeholder { - color: rgb(195, 195, 195) + color: rgb(195, 195, 195); } .gajim-msg-correcting text { - background: rgb(100, 100, 50) + background: rgb(100, 100, 50); } .gajim-search-highlight { - color: rgb(30, 80, 80) + color: rgb(30, 80, 80); } .gajim-notify-message { color: rgb(30, 144, 255); ===================================== gajim/data/style/default.css ===================================== @@ -1,54 +1,54 @@ .gajim-incoming-nickname { - color: rgb(200, 40, 40) + color: rgb(200, 40, 40); } .gajim-outgoing-nickname { - color: rgb(50, 90, 140) + color: rgb(50, 90, 140); } .gajim-outgoing-message-text { - color: rgb(85, 85, 85) + color: rgb(85, 85, 85); } .gajim-status-message { - color: rgb(100, 130, 160) + color: rgb(100, 130, 160); } .gajim-url { - color: rgb(30, 75, 135) + color: rgb(30, 75, 135); } .gajim-highlight-message { - color: rgb(210, 70, 30) + color: rgb(210, 70, 30); } .gajim-state-tab-muc-directed-msg { - color: rgb(210, 70, 30) + color: rgb(210, 70, 30); } .gajim-state-tab-muc-msg { - color: rgb(40, 40, 200) + color: rgb(40, 40, 200); } .gajim-roster-disconnected { - background: rgb(230, 170, 170) + background: rgb(230, 170, 170); } .gajim-roster-connected { - background: rgb(160, 200, 170) + background: rgb(160, 200, 170); } .gajim-state-composing { - color: rgb(40, 140, 40) + color: rgb(40, 140, 40); } .gajim-state-inactive { - color: rgb(158, 158, 158) + color: rgb(158, 158, 158); } .gajim-state-gone { - color: rgb(128, 128, 128) + color: rgb(128, 128, 128); } .gajim-state-paused { - color: rgb(20, 160, 120) + color: rgb(20, 160, 120); } .gajim-message-placeholder { - color: rgb(170, 170, 170) + color: rgb(170, 170, 170); } .gajim-msg-correcting text { - background: rgb(240, 230, 170) + background: rgb(240, 230, 170); } .gajim-search-highlight { - color: rgb(170, 220, 220) + color: rgb(170, 220, 220); } .gajim-notify-message { color: rgb(30, 144, 255); ===================================== gajim/data/style/gajim.css ===================================== @@ -6,13 +6,13 @@ border: none; } -.scrolled-no-border {border: none} +.scrolled-no-border { border: none; } .no-scroll-indicator undershoot.top, undershoot.bottom { background-image: none; } .scrollbar-style scrollbar trough {background-color:@theme_base_color; } .scrollbar-style scrollbar {border:none; } .one-line-scrollbar scrollbar.vertical slider { min-height: 20px; } -.actionbar-no-border box {border: none} +.actionbar-no-border box { border: none; } .actionbar-no-border button { padding: 0px; background-color: @theme_base_color; @@ -30,7 +30,7 @@ .chatcontrol-separator {margin-bottom: 5px;} -.link-button { min-height: 0px } +.link-button { min-height: 0px; } /* VCardWindow */ .VCard-GtkLinkButton { padding-left: 5px; border-left: none; } @@ -41,7 +41,7 @@ popover#EmoticonPopover button > label { font-size: 24px; } popover#EmoticonPopover flowboxchild > label { font-size: 24px; } popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } popover#EmoticonPopover scrolledwindow { border: none; } -popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_color} +popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_color; } .emoji-chooser-heading { font-size: 13px; font-weight: bold; padding: 5px;} .emoji-chooser-flowbox { padding-left: 5px; padding-right: 11px; } @@ -52,10 +52,10 @@ popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_ #HistorySyncAssistant progressbar text { color: #000; font-size: 18px; padding: 10px;} #HistorySyncAssistant list { border: 1px solid; border-color: @borders; } #HistorySyncAssistant list > row { padding: 10px 30px 10px 30px; } -#HistorySyncAssistant list > row > label { color: @insensitive_fg_color } +#HistorySyncAssistant list > row > label { color: @insensitive_fg_color; } #HistorySyncAssistant list > row.activatable > label { color: @theme_text_color; } #HistorySyncAssistant list > row.activatable:selected > label { color: @theme_selected_fg_color; } -#FinishedLabel { font-size: 14px; font-weight: bold } +#FinishedLabel { font-size: 14px; font-weight: bold; } /* Server Info */ #ServerInfo { border: 1px solid; border-color: @borders; } @@ -74,10 +74,10 @@ popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_ /* SettingsBox */ .settings-box > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } -.settings-box > row:last-child { border-bottom: 0px} +.settings-box > row:last-child { border-bottom: 0px; } .settings-box > row.activatable:active { box-shadow: none; } .settings-box > row { padding: 10px 20px 10px 10px; } -.settings-box > row:not(.activatable) label { color: @insensitive_fg_color } +.settings-box > row:not(.activatable) label { color: @insensitive_fg_color; } /* GenericSetting */ #SubDescription { color: @insensitive_fg_color; font-size: small;} @@ -88,7 +88,7 @@ popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_ .PopoverButtonListbox { padding-left: 0px; padding-right: 0px; } .PopoverButtonListbox > list { margin-top: 10px; margin-bottom: 10px; } .PopoverButtonListbox > list > row { padding: 10px 20px 10px 20px; } -.PopoverButtonListbox > list > row.activatable:active { box-shadow: none; background-color: @theme_selected_bg_color } +.PopoverButtonListbox > list > row.activatable:active { box-shadow: none; background-color: @theme_selected_bg_color; } /* Settings ListBox */ @@ -148,7 +148,7 @@ infobar.error > revealer > box { padding: 6px; } .tls-error-list > row:last-child { - border-bottom: 0px + border-bottom: 0px; } /* Start Chat Accounts Treeview */ @@ -158,10 +158,10 @@ infobar.error > revealer > box { /* StartChatListBox */ .start-chat-row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } -.start-chat-row:last-child { border-bottom: 0px} +.start-chat-row:last-child { border-bottom: 0px; } .start-chat-row.activatable:active { box-shadow: none; } .start-chat-row { padding: 10px 20px 10px 10px; } -.start-chat-row:not(.activatable) label { color: @insensitive_fg_color } +.start-chat-row:not(.activatable) label { color: @insensitive_fg_color; } .start-chat-row:focus { outline: none; } /* GroupChatRoster */ @@ -213,11 +213,11 @@ infobar.error > revealer > box { #ThemesWindow grid { padding: 12px; } .theme_listbox row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; padding: 5px 10px 5px 10px;} -.theme_listbox row:last-child { border-bottom: 0px} +.theme_listbox row:last-child { border-bottom: 0px; } .theme_listbox row.activatable:active { box-shadow: none; } -.theme_listbox row:not(.activatable) label { color: @insensitive_fg_color } +.theme_listbox row:not(.activatable) label { color: @insensitive_fg_color; } .theme_listbox row:focus { outline: none; } -.theme_listbox row:hover { background-color: @theme_base_color } +.theme_listbox row:hover { background-color: @theme_base_color; } .theme_remove_button { background-color: @theme_base_color; @@ -255,7 +255,7 @@ treeview.space { padding: 6px; } button.flat.link { padding: 0; border: 0; } /*MessageWindow Notebook*/ -.notebook-tab-label {min-width: 80px} +.notebook-tab-label { min-width: 80px; } /*Icon colors*/ .success-color { color: @success_color; } @@ -264,11 +264,11 @@ button.flat.link { padding: 0; border: 0; } .selected-color { color: @theme_selected_bg_color; } /*Encryption*/ -.encrypted-color { color: rgb(75, 181, 67) } -.unencrypted-color { color: @error_color } +.encrypted-color { color: rgb(75, 181, 67); } +.unencrypted-color { color: @error_color; } /*Receipts*/ -.receipt-received-color { color: rgb(75, 181, 67) } +.receipt-received-color { color: rgb(75, 181, 67); } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e52b9f3e32e25c638da885f8d54ab141… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e52b9f3e32e25c638da885f8d54ab141… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove ability to ignore tls errors
by Philipp Hörist 11 Aug '20

11 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b9d17352 by lovetox at 2020-08-11T17:39:14+02:00 Remove ability to ignore tls errors It’s complicated, error prone and people will shoot themself in the foot Because the current error dialog lets us only show one error, the only allowed tls error where a connect is still possible is EXPIRED. For UNKNOWN_CA there is still the possibility to mark the certificate as trusted, so it’s not considered a tls error on next connect. - - - - - 00d5b852 by lovetox at 2020-08-11T18:05:42+02:00 Client: Don’t try to resume the stream after stream error - - - - - 5 changed files: - gajim/common/client.py - gajim/common/config.py - gajim/common/helpers.py - gajim/data/gui/ssl_error_dialog.ui - gajim/gtk/ssl_error_dialog.py Changes: ===================================== gajim/common/client.py ===================================== @@ -33,7 +33,6 @@ from gajim.common.helpers import get_custom_host from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource -from gajim.common.helpers import get_ignored_tls_errors from gajim.common.helpers import get_idle_status_message from gajim.common.idle import Monitor from gajim.common.i18n import _ @@ -79,8 +78,6 @@ class Client(ConnectionHandlers): self._destroy_client = False self._remove_account = False - self._tls_errors = set() - self._destroyed = False self.available_transports = {} @@ -177,9 +174,6 @@ class Client(ConnectionHandlers): self._client.set_accepted_certificates( app.cert_store.get_certificates()) - self._client.set_ignored_tls_errors( - get_ignored_tls_errors(self._account)) - if app.config.get_per('accounts', self._account, 'use_plain_connection'): self._client.set_connection_types([ConnectionType.PLAIN]) @@ -200,17 +194,6 @@ class Client(ConnectionHandlers): for handler in modules.get_handlers(self): self._client.register_handler(handler) - def process_tls_errors(self): - if not self._tls_errors: - self.connect(ignore_all_errors=True) - return - - open_window('SSLErrorDialog', - account=self._account, - connection=self, - cert=self._client.peer_certificate[0], - error_num=self._tls_errors.pop()) - def _on_resume_failed(self, _client, _signal_name): log.info('Resume failed') app.nec.push_incoming_event(NetworkEvent( @@ -261,13 +244,16 @@ class Client(ConnectionHandlers): self._reconnect = False elif domain == StreamError.BAD_CERTIFICATE: - self._tls_errors = self._client.peer_certificate[1] - self.get_module('Chatstate').enabled = False self._reconnect = False - self._after_disconnect() - app.nec.push_incoming_event(NetworkEvent( - 'our-show', account=self._account, show='offline')) - self.process_tls_errors() + self._destroy_client = True + + cert, errors = self._client.peer_certificate + + open_window('SSLErrorDialog', + account=self._account, + client=self, + cert=cert, + error=errors.pop()) elif domain in (StreamError.STREAM, StreamError.BIND): if error == 'conflict': @@ -277,6 +263,7 @@ class Client(ConnectionHandlers): elif domain == StreamError.SASL: self._reconnect = False + self._destroy_client = True if error in ('not-authorized', 'no-password'): def _on_password(password): @@ -511,29 +498,29 @@ class Client(ConnectionHandlers): message.stanza = stanza self._send_message(message) - def connect(self, ignore_all_errors=False): + def connect(self, ignored_tls_errors=None): if self._state not in (ClientState.DISCONNECTED, ClientState.RECONNECT_SCHEDULED): # Do not try to reco while we are already trying return log.info('Connect') + + self._client.set_ignored_tls_errors(ignored_tls_errors) self._reconnect = True self._disable_reconnect_timer() self._set_state(ClientState.CONNECTING) - if ignore_all_errors: - self._client.set_ignore_tls_errors(True) - self._client.connect() - else: - if warn_about_plain_connection(self._account, - self._client.connection_types): - app.nec.push_incoming_event(NetworkEvent( - 'plain-connection', - account=self._account, - connect=self._client.connect, - abort=self._abort_reconnect)) - return - self._client.connect() + + if warn_about_plain_connection(self._account, + self._client.connection_types): + app.nec.push_incoming_event(NetworkEvent( + 'plain-connection', + account=self._account, + connect=self._client.connect, + abort=self._abort_reconnect)) + return + + self._client.connect() def _schedule_reconnect(self): self._set_state(ClientState.RECONNECT_SCHEDULED) ===================================== gajim/common/config.py ===================================== @@ -278,7 +278,6 @@ class Config: 'keyname': [opt_str, '', '', True], 'use_plain_connection': [opt_bool, False, _('Use an unencrypted connection to the server')], 'action_when_plain_connection': [opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', or \'none\'.')], - 'ignore_ssl_errors': [opt_str, '', _('List of SSL errors to ignore (space separated).')], 'use_custom_host': [opt_bool, False, '', True], 'custom_port': [opt_int, 5222, '', True], 'custom_host': [opt_str, '', '', True], ===================================== gajim/common/helpers.py ===================================== @@ -1402,12 +1402,6 @@ def warn_about_plain_connection(account, connection_types): return False -def get_ignored_tls_errors(account): - ignore_ssl_errors = app.config.get_per( - 'accounts', account, 'ignore_ssl_errors').split() - return {Gio.TlsCertificateFlags(int(err)) for err in ignore_ssl_errors} - - def get_idle_status_message(state, status_message): message = app.config.get(f'auto{state}_message') if not message: ===================================== gajim/data/gui/ssl_error_dialog.ui ===================================== @@ -80,6 +80,7 @@ <property name="margin_right">15</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_add_certificate_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -88,22 +89,7 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="ignore_error_checkbutton"> - <property name="label" translatable="yes">_Ignore this error for this certificate</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="margin_left">15</property> - <property name="margin_right">15</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> + <placeholder/> </child> <child> <object class="GtkBox"> @@ -133,6 +119,7 @@ <object class="GtkButton" id="connect_button"> <property name="label" translatable="yes">_Connect</property> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">end</property> ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -26,7 +26,7 @@ from gajim.gtk.util import open_window class SSLErrorDialog(Gtk.ApplicationWindow): - def __init__(self, account, connection, cert, error_num): + def __init__(self, account, client, cert, error): Gtk.ApplicationWindow.__init__(self) self.set_name('SSLErrorDialog') self.set_application(app.app) @@ -39,8 +39,8 @@ class SSLErrorDialog(Gtk.ApplicationWindow): self.add(self._ui.ssl_error_box) self.account = account - self._error_num = error_num - self._con = connection + self._error = error + self._client = client self._cert = cert self._server = app.config.get_per('accounts', self.account, 'hostname') @@ -54,30 +54,36 @@ class SSLErrorDialog(Gtk.ApplicationWindow): _('There was an error while attempting to verify the SSL ' 'certificate of your XMPP server (%s).') % self._server) - unknown_error = _('Unknown SSL error \'%s\'') % self._error_num - ssl_error = GIO_TLS_ERRORS.get(self._error_num, unknown_error) + unknown_error = _('Unknown SSL error \'%s\'') % self._error + ssl_error = GIO_TLS_ERRORS.get(self._error, unknown_error) self._ui.ssl_error.set_text(ssl_error) - if self._error_num == Gio.TlsCertificateFlags.UNKNOWN_CA: + if self._error == Gio.TlsCertificateFlags.UNKNOWN_CA: self._ui.add_certificate_checkbutton.show() + elif self._error == Gio.TlsCertificateFlags.EXPIRED: + self._ui.connect_button.set_sensitive(True) + + else: + self._ui.connect_button.set_no_show_all(True) + self._ui.connect_button.hide() + def _on_view_cert_clicked(self, _button): open_window('CertificateDialog', account=self.account, transient_for=self, cert=self._cert) - def _on_connect_clicked(self, _button): - # Ignore this error - if self._ui.ignore_error_checkbutton.get_active(): - ignore_ssl_errors = app.config.get_per( - 'accounts', self.account, 'ignore_ssl_errors').split() - ignore_ssl_errors.append(str(int(self._error_num))) - app.config.set_per('accounts', self.account, 'ignore_ssl_errors', - ' '.join(ignore_ssl_errors)) + def _on_add_certificate_toggled(self, checkbutton): + self._ui.connect_button.set_sensitive(checkbutton.get_active()) + def _on_connect_clicked(self, _button): if self._ui.add_certificate_checkbutton.get_active(): app.cert_store.add_certificate(self._cert) + ignored_tls_errors = None + if self._error == Gio.TlsCertificateFlags.EXPIRED: + ignored_tls_errors = set([Gio.TlsCertificateFlags.EXPIRED]) + self.destroy() - self._con.process_tls_errors() + self._client.connect(ignored_tls_errors=ignored_tls_errors) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/029dfc0ee978c884f31bf3ac65fedca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/029dfc0ee978c884f31bf3ac65fedca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: set_ignored_tls_errors() allow to pass None
by Philipp Hörist 11 Aug '20

11 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d896eb04 by lovetox at 2020-08-11T16:54:51+02:00 Client: set_ignored_tls_errors() allow to pass None - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -107,7 +107,7 @@ class Client(Observable): self._ping_id = None self._error = None, None, None - self._ignored_tls_errors = [] + self._ignored_tls_errors = set() self._ignore_tls_errors = False self._accepted_certificates = [] self._peer_certificate = None @@ -186,6 +186,8 @@ class Client(Observable): return self._ignored_tls_errors def set_ignored_tls_errors(self, errors): + if errors is None: + errors = set() self._ignored_tls_errors = errors @property View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d896eb04f270a67634d81bb0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d896eb04f270a67634d81bb0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Revert "Client: set_ignore_tls_errors() allow to pass None"
by Philipp Hörist 11 Aug '20

11 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7df6d266 by Philipp Hörist at 2020-08-11T16:48:13+02:00 Revert "Client: set_ignore_tls_errors() allow to pass None" This reverts commit 3bf7d2eaab6b12bd18045c2907e78224fc23e58d - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -193,8 +193,6 @@ class Client(Observable): return self._ignore_tls_errors def set_ignore_tls_errors(self, ignore): - if ignore is None: - ignore = [] self._ignore_tls_errors = ignore def set_password(self, password): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7df6d26632d5007c84b0c5b4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7df6d26632d5007c84b0c5b4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add namespace of XEP-393
by Philipp Hörist 11 Aug '20

11 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e559a3f8 by André Apitzsch at 2020-08-11T16:21:41+02:00 Add namespace of XEP-393 - - - - - 1 changed file: - nbxmpp/namespaces.py Changes: ===================================== nbxmpp/namespaces.py ===================================== @@ -146,6 +146,7 @@ class _Namespaces: STREAM: str = 'http://affinix.com/jabber/stream' STREAMS: str = 'http://etherx.jabber.org/streams' STREAM_MGMT: str = 'urn:xmpp:sm:3' + STYLING: str = 'urn:xmpp:styling:0' TIME_REVISED: str = 'urn:xmpp:time' TLS: str = 'urn:ietf:params:xml:ns:xmpp-tls' TUNE: str = 'http://jabber.org/protocol/tune' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e559a3f8d7c9b73f8e05a208… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e559a3f8d7c9b73f8e05a208… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: set_ignore_tls_errors() allow to pass None
by Philipp Hörist 11 Aug '20

11 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3bf7d2ea by lovetox at 2020-08-11T16:16:52+02:00 Client: set_ignore_tls_errors() allow to pass None - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -193,6 +193,8 @@ class Client(Observable): return self._ignore_tls_errors def set_ignore_tls_errors(self, ignore): + if ignore is None: + ignore = [] self._ignore_tls_errors = ignore def set_password(self, password): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3bf7d2eaab6b12bd18045c29… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3bf7d2eaab6b12bd18045c29… 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