Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Pushed new tag 1.4.3
by Philipp Hörist (＠lovetox) 01 Jun '22

01 Jun '22

Philipp Hörist pushed new tag 1.4.3 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/1.4.3 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] release: 1.4.3
by Philipp Hörist (＠lovetox) 01 Jun '22

01 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1a4be214 by lovetox at 2022-06-01T16:46:08+02:00 release: 1.4.3 - - - - - 3 changed files: - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -74,6 +74,7 @@ <control>pointing</control> </recommends> <releases> + <release version="1.4.3" date="2022-06-01" /> <release version="1.4.2" date="2022-05-25" /> <release version="1.4.1" date="2022-05-21" /> <release version="1.4.0" date="2022-05-11" /> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -312,6 +312,6 @@ modules: sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - tag: 1.4.2 + tag: 1.4.3 post-install: - install -d /app/plugins ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import sys from pathlib import Path -__version__ = '1.4.2' +__version__ = '1.4.3' IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a4be21484e43e7b9839ee140f5c25ab… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a4be21484e43e7b9839ee140f5c25ab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update ChangeLog
by Philipp Hörist (＠lovetox) 01 Jun '22

01 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: b94c50e9 by lovetox at 2022-06-01T16:44:29+02:00 chore: Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,39 @@ +Gajim 1.4.3 (01 Jun 2022) + + Improvements + + * AppPage: Show plugin update notifications + * ChatList: Add middle mouse click for closing a chat + * DirectorySearch: Use Gio.Menu, add Start Chat item + * Group chat roster: Store visibility + * Smaller Jingle file transfer widget + * Unify ContactInfo and GroupchatDetails elements width + * Windows: Change PANGOCAIRO backend to enable colored emojis + * Windows: Enable native emoji chooser + * Workspaces: Add Move to new workspace functionality + * #10812 Workspaces: Enable emoji picker + * #10876 Windows: Simplify installer + * #10905 Avatars: Render emojis correctly + + Bug Fixes + + * AddContact: Fix opening AdHocCommands window + * ContactInfo: Fix copying name and JID by Ctrl+C + * DirectorySearch: Correctly connect form validation + * Don’t fail on GajimPlugin equality test + * History: Don’t remove JID IDs from database + * InfoBar: Add style rule for anchors in dark mode + * Make GStreamer an optional dependency again + * Plugins: Unregister modules after calling deactivate() + * Replace user-visible strings of 'Groupchat' with 'Group Chat' + * WorkspaceDialog: Disable Remove button for last workspace + * #10903 Notifications: Show correct chat when clicking notification on Windows + * #10911 AccountsWindow: Use get_app_window to reliably access window's methods + * #10912 VCardGrid: Request minimum width + * #10921 ChatControl: Don't update AV actions for PMs + * #10922 Search: Add fail-safe for incomplete JID ID tables + * #10924 StartChat: Allow transport JIDs without successful discovery + Gajim 1.4.2 (25 May 2022) New View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b94c50e913e158701e1b94ff2f7a3fdb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b94c50e913e158701e1b94ff2f7a3fdb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update translations
by Philipp Hörist (＠lovetox) 01 Jun '22

01 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d598e88f by Weblate at 2022-06-01T16:20:24+02:00 chore: Update translations - - - - - 5 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d598e88f97a76bfe2b1f7c8ea5db7c02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d598e88f97a76bfe2b1f7c8ea5db7c02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AddContact: Fix opening AdHocCommands window
by Daniel Brötzmann (＠wurstsalat) 01 Jun '22

01 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b5d22690 by wurstsalat at 2022-06-01T15:49:49+02:00 fix: AddContact: Fix opening AdHocCommands window - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -477,7 +477,7 @@ def _on_register_clicked(self, _button: Gtk.Button) -> None: def _on_command_clicked(self, _button: Gtk.Button) -> None: assert self._result is not None open_window( - 'AdHocCommand', account=self._account, jid=str(self._result.jid)) + 'AdHocCommands', account=self._account, jid=str(self._result.jid)) class GroupChat(Page): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b5d22690f09c4bc2bb6619875e8c69ac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b5d22690f09c4bc2bb6619875e8c69ac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: Windows: Simplify installer
by Daniel Brötzmann (＠wurstsalat) 01 Jun '22

01 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e63ea749 by wurstsalat at 2022-06-01T14:06:35+02:00 imprv: Windows: Simplify installer - Simplify the process of automatically uninstalling previous versions - Fix running upgrade in silent mode - Remove obsolete strings Fixes #10876 - - - - - b719aa4c by wurstsalat at 2022-06-01T14:06:35+02:00 chore: Windows: Remove obsolete strings from portable installer - - - - - 2 changed files: - win/misc/gajim-portable.nsi - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim-portable.nsi ===================================== @@ -48,61 +48,26 @@ BrandingText "Gajim Setup" !insertmacro MUI_RESERVEFILE_LANGDLL ; English -LangString NAME_Emoticons ${LANG_ENGLISH} "Emoticons" -LangString NAME_Iconsets ${LANG_ENGLISH} "Iconsets" -LangString NAME_Languages ${LANG_ENGLISH} "Languages" -LangString NAME_SecLanguagesOther ${LANG_ENGLISH} "Other" -LangString NAME_Themes ${LANG_ENGLISH} "Themes" LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." LangString INST_NotEmpty ${LANG_ENGLISH} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" - ; French -LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes" -LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothèque d'icônes" -LangString NAME_Languages ${LANG_FRENCH} "Langues" -LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre" -LangString NAME_Themes ${LANG_FRENCH} "Thèmes" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." LangString INST_NotEmpty ${LANG_FRENCH} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" - ; German -LangString NAME_Emoticons ${LANG_GERMAN} "Emojis" -LangString NAME_Iconsets ${LANG_GERMAN} "Iconsets" -LangString NAME_Languages ${LANG_GERMAN} "Sprachen" -LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige" -LangString NAME_Themes ${LANG_GERMAN} "Designs" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." LangString INST_NotEmpty ${LANG_GERMAN} "Anscheinend ist Gajim bereits in diesem Verzeichnis installiert. Vor der Installation ist es notwendig das Verzeichnis aufzuräumen. Deine Benutzerdaten bleiben erhalten. Jetzt aufräumen?" - ; Italian -LangString NAME_Emoticons ${LANG_ITALIAN} "Emoticons" -LangString NAME_Iconsets ${LANG_ITALIAN} "Set di icone" -LangString NAME_Languages ${LANG_ITALIAN} "Lingue" -LangString NAME_SecLanguagesOther ${LANG_ITALIAN} "Altre" -LangString NAME_Themes ${LANG_ITALIAN} "Temi" LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." LangString INST_NotEmpty ${LANG_ITALIAN} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" - ; Russian -LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики" -LangString NAME_Iconsets ${LANG_RUSSIAN} "Темы иконок" -LangString NAME_Languages ${LANG_RUSSIAN} "Языки" -LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое" -LangString NAME_Themes ${LANG_RUSSIAN} "Темы" LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim." LangString INST_NotEmpty ${LANG_RUSSIAN} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" - ; Hebrew -LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים" -LangString NAME_Iconsets ${LANG_HEBREW} "מערכי צלמית" -LangString NAME_Languages ${LANG_HEBREW} "שפות" -LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות" -LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא" LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים." LangString INST_NotEmpty ${LANG_HEBREW} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ===================================== win/misc/gajim.nsi ===================================== @@ -3,7 +3,6 @@ Unicode true !include "MUI2.nsh" !include "LogicLib.nsh" -!include "nsDialogs.nsh" Name "Gajim" OutFile "Gajim.exe" @@ -36,7 +35,6 @@ Var StartMenuFolder !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Gajim" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder -Page custom CheckForUpgrade StartUpgrade /ENABLECANCEL !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_RUN "$INSTDIR\bin\Gajim.exe" !insertmacro MUI_PAGE_FINISH @@ -58,11 +56,6 @@ Page custom CheckForUpgrade StartUpgrade /ENABLECANCEL !insertmacro MUI_RESERVEFILE_LANGDLL ; English -LangString NAME_Emoticons ${LANG_ENGLISH} "Emoticons" -LangString NAME_Iconsets ${LANG_ENGLISH} "Iconsets" -LangString NAME_Languages ${LANG_ENGLISH} "Languages" -LangString NAME_SecLanguagesOther ${LANG_ENGLISH} "Other" -LangString NAME_Themes ${LANG_ENGLISH} "Themes" LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_ENGLISH} "Start Gajim when Windows starts" LangString NAME_SecURI ${LANG_ENGLISH} "Open xmpp links with Gajim" @@ -70,17 +63,8 @@ LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "Creates a shortcut for Gajim on your desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "Starts Gajim automatically when starting Windows." LangString DESC_SecURI ${LANG_ENGLISH} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." -LangString STR_Installed_Title ${LANG_ENGLISH} "Upgrade" -LangString STR_Installed_Text ${LANG_ENGLISH} "Upgrade Gajim" -LangString STR_Installed_Desc ${LANG_ENGLISH} "Gajim is already installed. Do you want to upgrade Gajim?" -LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\nPlease quit Gajim and try again." ; French -LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes" -LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothèque d'icônes" -LangString NAME_Languages ${LANG_FRENCH} "Langues" -LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre" -LangString NAME_Themes ${LANG_FRENCH} "Thèmes" LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau" LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows" LangString NAME_SecURI ${LANG_FRENCH} "Ouvrir les liens xmpp avec Gajim" @@ -88,17 +72,8 @@ LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Ga LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." LangString DESC_SecURI ${LANG_FRENCH} "Permet à Gajim d’ouvrir les liens xmpp (par exemple le lien vers un salon sur un site web)." -LangString STR_Installed_Title ${LANG_FRENCH} "Upgrade" -LangString STR_Installed_Text ${LANG_FRENCH} "Upgrade Gajim" -LangString STR_Installed_Desc ${LANG_FRENCH} "Gajim is already installed. Do you want to upgrade Gajim?" -LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\nPlease quit Gajim and try again." ; German -LangString NAME_Emoticons ${LANG_GERMAN} "Emojis" -LangString NAME_Iconsets ${LANG_GERMAN} "Iconsets" -LangString NAME_Languages ${LANG_GERMAN} "Sprachen" -LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige" -LangString NAME_Themes ${LANG_GERMAN} "Designs" LangString NAME_SecDesktopIcon ${LANG_GERMAN} "Desktop-Icon erstellen" LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten" LangString NAME_SecURI ${LANG_GERMAN} "xmpp-Links mit Gajim öffnen" @@ -106,17 +81,8 @@ LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim. LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Erstellt ein Icon für Gajim auf dem Desktop." LangString DESC_SecAutostart ${LANG_GERMAN} "Startet Gajim automatisch zusammen mit Windows." LangString DESC_SecURI ${LANG_GERMAN} "Ermöglicht Gajim das Öffnen von xmpp-Links (z.B. verlinkter Gruppenchat auf einer Website)." -LangString STR_Installed_Title ${LANG_GERMAN} "Aktualisieren" -LangString STR_Installed_Text ${LANG_GERMAN} "Gajim aktualisieren" -LangString STR_Installed_Desc ${LANG_GERMAN} "Gajim ist bereits installiert. Wollen sie Gajim aktualisieren?" -LangString STR_Running ${LANG_GERMAN} "Gajim läuft zurzeit.$\nBitte beenden Sie Gajim und versuchen es erneut." ; Italian -LangString NAME_Emoticons ${LANG_ITALIAN} "Emoticons" -LangString NAME_Iconsets ${LANG_ITALIAN} "Set di icone" -LangString NAME_Languages ${LANG_ITALIAN} "Lingue" -LangString NAME_SecLanguagesOther ${LANG_ITALIAN} "Altre" -LangString NAME_Themes ${LANG_ITALIAN} "Temi" LangString NAME_SecDesktopIcon ${LANG_ITALIAN} "Crea un'icona sul desktop" LangString NAME_SecAutostart ${LANG_ITALIAN} "Lancia Gajim quando parte Windows" LangString NAME_SecURI ${LANG_ITALIAN} "Open xmpp links with Gajim" @@ -124,17 +90,8 @@ LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." LangString DESC_SecURI ${LANG_ITALIAN} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." -LangString STR_Installed_Title ${LANG_ITALIAN} "Upgrade" -LangString STR_Installed_Text ${LANG_ITALIAN} "Upgrade Gajim" -LangString STR_Installed_Desc ${LANG_ITALIAN} "Gajim is already installed. Do you want to upgrade Gajim?" -LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\nPlease quit Gajim and try again." ; Russian -LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики" -LangString NAME_Iconsets ${LANG_RUSSIAN} "Темы иконок" -LangString NAME_Languages ${LANG_RUSSIAN} "Языки" -LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое" -LangString NAME_Themes ${LANG_RUSSIAN} "Темы" LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "Создать я лык на абочем столе" LangString NAME_SecAutostart ${LANG_RUSSIAN} "Запускать Gajim при загрузке Windows" LangString NAME_SecURI ${LANG_RUSSIAN} "Открывать xmpp-ссылки в Gajim" @@ -142,17 +99,8 @@ LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных ф LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Если отмечено, на рабочем столе будет создан ярлык Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Если отмечено, Gajim будет автоматически запускаться при загрузке Windows." LangString DESC_SecURI ${LANG_RUSSIAN} "Позволяет Gajim открывать xmpp-ссылки, например, адреса конференций на веб-странице." -LangString STR_Installed_Title ${LANG_RUSSIAN} "Upgrade" -LangString STR_Installed_Text ${LANG_RUSSIAN} "Upgrade Gajim" -LangString STR_Installed_Desc ${LANG_RUSSIAN} "Gajim is already installed. Do you want to upgrade Gajim?" -LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\nPlease quit Gajim and try again." ; Hebrew -LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים" -LangString NAME_Iconsets ${LANG_HEBREW} "מערכי צלמית" -LangString NAME_Languages ${LANG_HEBREW} "שפות" -LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות" -LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא" LangString NAME_SecDesktopIcon ${LANG_HEBREW} "צור סמל בשולחן עבודה" LangString NAME_SecAutostart ${LANG_HEBREW} "הפעל את Gajim כאשר Windows מתחיל" LangString NAME_SecURI ${LANG_HEBREW} "Open xmpp links with Gajim" @@ -160,20 +108,22 @@ LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריי LangString DESC_SecDesktopIcon ${LANG_HEBREW} "במידה ונקבעת, קיצור דרך עבור Gajim יושם על שולחן העבודה." LangString DESC_SecAutostart ${LANG_HEBREW} "במידה ונקבעת, Gajim יופעל אוטומטית כאשר Windows מתחיל." LangString DESC_SecURI ${LANG_HEBREW} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." -LangString STR_Installed_Title ${LANG_HEBREW} "Upgrade" -LangString STR_Installed_Text ${LANG_HEBREW} "Upgrade Gajim" -LangString STR_Installed_Desc ${LANG_HEBREW} "Gajim is already installed. Do you want to upgrade Gajim?" -LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\nPlease quit Gajim and try again." Section "Gajim" SecGajim SectionIn RO Var /GLOBAL arch_name StrCpy $arch_name "(64-Bit)" - StrCmp ${ARCH} "mingw64" cont + StrCmp ${ARCH} "mingw64" continue StrCpy $arch_name "(32-Bit)" - cont: - + continue: + + ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" + ${If} ${FileExists} $R3 + ; If Gajim was installed before, run uninstaller (in silent mode) + ExecWait '"$R3" /S _?=$INSTDIR' + ${EndIf} + SetOutPath "$INSTDIR" File /r "${ARCH}\*.*" @@ -218,8 +168,10 @@ Section $(NAME_SecURI) SecURI SectionEnd Section "Uninstall" - + ; Hint: Gajim setup should not be named gajim.exe, else it will be killed here ExecWait "TaskKill /IM gdbus.exe /F" + ExecWait "TaskKill /IM gajim.exe /F" + ExecWait "TaskKill /IM gajim-debug.exe /F" RMDir /r "$INSTDIR" @@ -227,13 +179,11 @@ Section "Uninstall" SetShellVarContext current Delete "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" - Delete "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" RMDir "$SMPROGRAMS\$StartMenuFolder" Delete "$DESKTOP\Gajim.lnk" Delete "$SMSTARTUP\Gajim.lnk" SetShellVarContext all Delete "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" - Delete "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" RMDir "$SMPROGRAMS\$StartMenuFolder" DeleteRegKey /ifempty HKCU "Software\Gajim" @@ -247,53 +197,10 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecURI} $(DESC_SecURI) !insertmacro MUI_FUNCTION_DESCRIPTION_END -; Installer -Function StartUpgrade - ; Disable 'Upgrade', 'Cancel', and 'Back' buttons to avoid further clicks - GetDlgItem $1 $HWNDPARENT 1 - EnableWindow $1 0 - GetDlgItem $2 $HWNDPARENT 2 - EnableWindow $2 0 - GetDlgItem $3 $HWNDPARENT 3 - EnableWindow $3 0 - - ; Hint: Gajim setup should not be named gajim.exe - ExecWait "TaskKill /IM gajim.exe /F" - ExecWait "TaskKill /IM gajim-debug.exe /F" - - ; Run uninstaller in silent mode - ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" - ExecWait '"$R3" /S _?=$INSTDIR' -FunctionEnd - -Function CheckForUpgrade - ; Check if Gajim is already installed - ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" - ; Show upgrade page only if Gajim is already installed - ${IfNot} ${FileExists} $R3 - Abort - ${EndIf} - - !insertmacro MUI_HEADER_TEXT $(STR_Installed_Title) $(STR_Installed_Text) - - nsDialogs::Create 1018 - Pop $0 - - ${NSD_CreateLabel} 0 10% 100% 12u "$(STR_Installed_Desc)" - Pop $0 - - ; Change Next Button text - GetDlgItem $0 $HWNDPARENT 1 - ${NSD_SetText} $0 "$(STR_Installed_Title)" - Pop $0 - - nsDialogs::Show -FunctionEnd - Function .onInit BringToFront -; Check if already running -; If so don't open another but bring to front + ; Check if already running + ; If so don't open another but bring to front System::Call "kernel32::CreateMutexA(i 0, i 0, t '$(^Name)') i .r0 ?e" Pop $0 StrCmp $0 0 StartInstall @@ -308,24 +215,3 @@ Function .onInit StartInstall: !insertmacro MUI_LANGDLL_DISPLAY ; Open the language selection window FunctionEnd - -; Uninstaller -Function un.onInit -; Check that Gajim is not running before uninstalling - FindWindow $0 "gdkWindowToplevel" "Gajim" - StrCmp $0 0 StartUninstall - IfSilent ForceQuitGajim - MessageBox MB_ICONEXCLAMATION|MB_RETRYCANCEL $(STR_Running) IDCANCEL Cancel IDRETRY -3 - -Cancel: - Abort - -ForceQuitGajim: - ; Hint: Gajim setup should not be named gajim.exe - ExecWait "TaskKill /IM gajim.exe /F" - ExecWait "TaskKill /IM gajim-debug.exe /F" - !insertmacro MUI_UNGETLANGUAGE - -StartUninstall: - !insertmacro MUI_UNGETLANGUAGE ; Open the language selection window -FunctionEnd \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ebd3da5fe5bc19638bdbdb66f509515… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ebd3da5fe5bc19638bdbdb66f509515… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: fix: CoreApplication: Import modules after dependency check
by Philipp Hörist (＠lovetox) 01 Jun '22

01 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9da073b9 by lovetox at 2022-06-01T09:09:47+02:00 fix: CoreApplication: Import modules after dependency check - - - - - 7d76372d by lovetox at 2022-06-01T09:09:47+02:00 fix: Make GStreamer an optional dependency again - - - - - ebd3da5f by lovetox at 2022-06-01T09:09:47+02:00 chore: Update runtime requirements - - - - - 6 changed files: - README.md - debian/control - gajim/common/application.py - gajim/common/preview_helpers.py - gajim/gtk/gstreamer.py - gajim/gtk/preview_audio.py Changes: ===================================== README.md ===================================== @@ -16,11 +16,6 @@ ### Runtime Requirements - GLib (>=2.60.0) - gir1.2-gtksource-4 - gir1.2-soup-2.4 -- gir1.2-gstreamer-1.0 -- gir1.2-gst-plugins-base-1.0 -- gstreamer1.0-plugins-ugly -- gstreamer1.0-libav -- gstreamer1.0-gtk3 ### Optional Runtime Requirements @@ -33,7 +28,15 @@ ### Optional Runtime Requirements - gir1.2-networkmanager-1.0 for network lose detection - gir1.2-geoclue-2.0 for sharing your location - gir1.2-gsound-1.0 for sound on Linux + +#### For Video and Audio Calls + - gir1.2-farstream-0.2 for video calls +- gir1.2-gstreamer-1.0 for video and audio calls +- gir1.2-gst-plugins-base-1.0 for video and audio calls +- gstreamer1.0-plugins-ugly for video and audio calls +- gstreamer1.0-libav for video and audio calls +- gstreamer1.0-gtk3 ### Compile-time Requirements ===================================== debian/control ===================================== @@ -40,21 +40,21 @@ Depends: python3-css-parser, gir1.2-gtk-3.0 (>= 3.22.27~), gir1.2-gtksource-4, - gir1.2-gstreamer-1.0 - gir1.2-gst-plugins-base-1.0 - gstreamer1.0-plugins-ugly - gstreamer1.0-libav - gstreamer1.0-gtk3 Recommends: aspell-en | aspell-dictionary, ca-certificates, dbus, fonts-noto-color-emoji, - gir1.2-farstream-0.2, gir1.2-gsound-1.0, gir1.2-gspell-1, gir1.2-gupnpigd-1.0, gir1.2-secret-1, + gir1.2-farstream-0.2, + gir1.2-gstreamer-1.0, + gir1.2-gst-plugins-base-1.0, + gstreamer1.0-plugins-ugly, + gstreamer1.0-libav, + gstreamer1.0-gtk3, notification-daemon, pulseaudio-utils | alsa-utils | sox | oss4-base, python3-dbus (>=0.81), ===================================== gajim/common/application.py ===================================== @@ -35,10 +35,8 @@ from gajim.common.events import AccountDisonnected from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable -from gajim.common.call_manager import CallManager from gajim.common.client import Client from gajim.common.helpers import make_http_request -from gajim.common.preview import PreviewManager from gajim.common.task_manager import TaskManager from gajim.common.settings import Settings from gajim.common.settings import LegacyConfig @@ -69,8 +67,10 @@ def _init_core(self) -> None: app.cert_store = CertificateStore() app.task_manager = TaskManager() + from gajim.common.call_manager import CallManager app.call_manager = CallManager() + from gajim.common.preview import PreviewManager app.preview_manager = PreviewManager() self._network_monitor = Gio.NetworkMonitor.get_default() ===================================== gajim/common/preview_helpers.py ===================================== @@ -31,7 +31,11 @@ from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Gio -from gi.repository import GstPbutils + +try: + from gi.repository import GstPbutils +except Exception: + pass from PIL import Image from PIL import ImageFile ===================================== gajim/gtk/gstreamer.py ===================================== @@ -12,6 +12,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 __future__ import annotations + from typing import Optional from typing import Tuple ===================================== gajim/gtk/preview_audio.py ===================================== @@ -12,6 +12,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 __future__ import annotations + from typing import Optional import logging @@ -19,7 +21,10 @@ from gi.repository import GLib from gi.repository import Gtk -from gi.repository import Gst +try: + from gi.repository import Gst +except Exception: + pass from gajim.common.i18n import _ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f18820a12f46335f61702cdc0774434… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f18820a12f46335f61702cdc0774434… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: AccountWizard: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 31 May '22

31 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f18820a1 by wurstsalat at 2022-05-31T23:44:45+02:00 chore: AccountWizard: Add type annotations - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -12,10 +12,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Any -from typing import List +from typing import cast +from typing import Literal from typing import Optional -from typing import Tuple +from typing import overload from typing import Union import logging @@ -41,7 +44,8 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import helpers -from gajim.common.events import StanzaReceived, StanzaSent +from gajim.common.events import StanzaReceived +from gajim.common.events import StanzaSent from gajim.common.helpers import open_uri from gajim.common.helpers import validate_jid from gajim.common.helpers import get_proxy @@ -49,10 +53,12 @@ from gajim.common.const import SASL_ERRORS from gajim.common.const import GIO_TLS_ERRORS +from .accounts import AccountsWindow from .assistant import Assistant +from .assistant import ErrorPage from .assistant import Page +from .assistant import ProgressPage from .assistant import SuccessPage -from .assistant import ErrorPage from .dataform import DataFormWidget from .builder import get_builder from .util import open_window @@ -86,7 +92,7 @@ def __init__(self) -> None: 'error': Error(), }) - self._progress = self.add_default_page('progress') + self.add_default_page('progress') self.get_page('login').connect('clicked', self._on_button_clicked) self.connect('button-clicked', self._on_assistant_button_clicked) @@ -100,7 +106,31 @@ def __init__(self) -> None: self._client: Optional[Client] = None self._method: str = 'login' - def get_currenct_method(self) -> str: + @overload + def get_page(self, name: Literal['login']) -> Login: ... + @overload + def get_page(self, name: Literal['signup']) -> Signup: ... + @overload + def get_page(self, name: Literal['advanced']) -> AdvancedSettings: ... + @overload + def get_page(self, + name: Literal['security-warning'] + ) -> SecurityWarning: ... + @overload + def get_page(self, name: Literal['form']) -> Form: ... + @overload + def get_page(self, name: Literal['redirect']) -> Redirect: ... + @overload + def get_page(self, name: Literal['success']) -> Success: ... + @overload + def get_page(self, name: Literal['error']) -> Error: ... + @overload + def get_page(self, name: Literal['progress']) -> ProgressPage: ... + + def get_page(self, name: str) -> Page: + return self._pages[name] + + def get_current_method(self) -> str: return self._method def _on_button_clicked(self, _page: Gtk.Widget, button_name: str) -> None: @@ -126,8 +156,9 @@ def _on_assistant_button_clicked(self, elif page == 'security-warning': if self.get_page('security-warning').trust_certificate: - app.cert_store.add_certificate( - self.get_page('security-warning').cert) + cert = self.get_page('security-warning').cert + assert cert is not None + app.cert_store.add_certificate(cert) self._test_credentials(ignore_all_errors=True) elif button_name == 'signup': @@ -150,8 +181,9 @@ def _on_assistant_button_clicked(self, elif page == 'security-warning': if self.get_page('security-warning').trust_certificate: - app.cert_store.add_certificate( - self.get_page('security-warning').cert) + cert = self.get_page('security-warning').cert + assert cert is not None + app.cert_store.add_certificate(cert) if self.get_page('signup').is_anonymous(): self._test_anonymous_server(ignore_all_errors=True) @@ -210,7 +242,7 @@ def update_proxy_list(self) -> None: def _get_base_client(self, domain: str, - username: str, + username: Optional[str], mode: Mode, advanced: bool, ignore_all_errors: bool @@ -413,8 +445,8 @@ def _show_error_page(self, title: str, heading: str, text: str) -> None: self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) def _show_progress_page(self, title: str, text: str) -> None: - self._progress.set_title(title) - self._progress.set_text(text) + self.get_page('progress').set_title(title) + self.get_page('progress').set_text(text) self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) @staticmethod @@ -587,7 +619,7 @@ def _update_completion(self, entry: Gtk.Entry) -> None: return text = text.split('@', 1)[0] - model = entry.get_completion().get_model() + model = cast(Gtk.ListStore, entry.get_completion().get_model()) model.clear() for server in self._servers: @@ -626,12 +658,12 @@ def _validate_jid(self, address: str) -> bool: def _set_complete(self, *args: Any) -> None: address = self._validate_jid(self._ui.log_in_address_entry.get_text()) password = self._ui.log_in_password_entry.get_text() - self._ui.log_in_button.set_sensitive(address and password) + self._ui.log_in_button.set_sensitive(bool(address and password)) def is_advanced(self) -> bool: return self._ui.login_advanced_checkbutton.get_active() - def get_credentials(self) -> Tuple[str, str]: + def get_credentials(self) -> tuple[str, str]: data = (self._ui.log_in_address_entry.get_text(), self._ui.log_in_password_entry.get_text()) return data @@ -713,7 +745,7 @@ def _on_activate_link(_label: Gtk.Label, uri: str) -> int: open_uri(uri) return Gdk.EVENT_STOP - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back', 'signup'] def get_default_button(self) -> str: @@ -753,7 +785,7 @@ def get_proxy(self) -> str: active = self._ui.proxies_combobox.get_active() return self._ui.proxies_combobox.get_model()[active][0] - def get_custom_host(self) -> Optional[Tuple[str, + def get_custom_host(self) -> Optional[tuple[str, ConnectionProtocol, ConnectionType]]: host = self._ui.custom_host_entry.get_text() @@ -841,11 +873,13 @@ def _set_complete(self, *args: Any) -> None: self.update_page_complete() - def get_visible_buttons(self) -> List[str]: - return ['back', self.get_toplevel().get_currenct_method()] + def get_visible_buttons(self) -> list[str]: + return [ + 'back', + cast(AccountWizard, self.get_toplevel()).get_current_method()] def get_default_button(self) -> str: - return self.get_toplevel().get_currenct_method() + return cast(AccountWizard, self.get_toplevel()).get_current_method() class SecurityWarning(Page): @@ -867,7 +901,7 @@ def cert(self) -> Optional[Gio.TlsCertificate]: def set_warning(self, domain: str, cert: Gio.TlsCertificate, - errors: List[Gio.TlsCertificateFlags] + errors: list[Gio.TlsCertificateFlags] ) -> None: # Clear list self._cert = cert @@ -903,8 +937,10 @@ def _on_view_cert(self, _button: Gtk.Button) -> None: def trust_certificate(self) -> bool: return self._ui.trust_cert_checkbutton.get_active() - def get_visible_buttons(self) -> List[str]: - return ['back', self.get_toplevel().get_currenct_method()] + def get_visible_buttons(self) -> list[str]: + return [ + 'back', + cast(AccountWizard, self.get_toplevel()).get_current_method()] def get_default_button(self) -> str: return 'back' @@ -947,7 +983,7 @@ def add_form(self, form: Any) -> None: self.pack_start(self._current_form, True, True, 0) self._current_form.show_all() - def get_credentials(self) -> Tuple[str, str]: + def get_credentials(self) -> tuple[str, str]: return (self._current_form.get_form()['username'].value, self._current_form.get_form()['password'].value) @@ -965,7 +1001,7 @@ def remove_form(self) -> None: def focus(self) -> None: self._current_form.focus_first_entry() - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back', 'signup'] def get_default_button(self) -> str: @@ -990,9 +1026,10 @@ def set_redirect(self, link: str, instructions: str) -> None: self._link = link def _on_link_button(self, _button:Gtk.Button) -> None: + assert self._link is not None open_uri(self._link) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back'] @@ -1059,11 +1096,11 @@ def _save_config(self) -> None: app.settings.set_account_setting( self._account, 'account_label', self._label) app.css_config.refresh() - window = get_app_window('AccountsWindow') + window = cast(AccountsWindow, get_app_window('AccountsWindow')) if window is not None: window.update_account_label(self._account) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['connect'] @@ -1072,5 +1109,5 @@ def __init__(self) -> None: ErrorPage.__init__(self) self.set_heading(_('An error occurred during account creation')) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back'] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f18820a12f46335f61702cdc0774434d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f18820a12f46335f61702cdc0774434d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Flatpak: Update dependencies
by André (＠andre) 31 May '22

31 May '22

André pushed to branch master at gajim / gajim Commits: abde1e9e by André Apitzsch at 2022-05-31T21:43:53+02:00 other: Flatpak: Update dependencies - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -60,11 +60,11 @@ modules: - name: python3-pyparsing buildsystem: simple build-commands: - - pip3 install pyparsing-3.0.8-py3-none-any.whl + - pip3 install pyparsing-3.0.9-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.8-py3… - sha256: ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06 + url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.9-py3… + sha256: 5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc - name: python3-packaging buildsystem: simple @@ -182,24 +182,24 @@ modules: - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-4.11.3-py3-none-any.whl + - pip3 install importlib_metadata-4.11.4-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6 + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.5.0-py3-none-any.whl + - pip3 install keyring-23.5.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.0-py3-no… - sha256: b0d28928ac3ec8e42ef4cc227822647a19f1d544f21f96457965dc01cf555261 + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.1-py3-no… + sha256: 9ef58314bcc823f426b49ec787539a2d73571b37de4cd498f839803b01acff1e - name: python3-css-parser buildsystem: simple @@ -271,8 +271,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.0.tar.gz - sha256: f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97 + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.1.tar.gz + sha256: 7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0 # sentry-sdk dependency - name: python3-urllib3 @@ -287,20 +287,20 @@ modules: - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2021.10.8-py2.py3-none-any.whl + - pip3 install certifi-2022.5.18.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/c/certifi/certifi-2021.10.8… - sha256: d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569 + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.5.18.1-p… + sha256: f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.5.11-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.5.12-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… - sha256: c17179183cac614e900cbd048dab03f49a48e2820182ec686c25e7ce46f8548f + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… + sha256: 778b53f0a6c83b1ee43d3b7886318ba86d975e686cb2c7906ccc35b334360be1 - name: python3-nbxmpp buildsystem: simple ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -53,11 +53,11 @@ modules: - name: python3-pyparsing buildsystem: simple build-commands: - - pip3 install pyparsing-3.0.8-py3-none-any.whl + - pip3 install pyparsing-3.0.9-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.8-py3… - sha256: ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06 + url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.9-py3… + sha256: 5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc - name: python3-packaging buildsystem: simple @@ -175,24 +175,24 @@ modules: - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-4.11.3-py3-none-any.whl + - pip3 install importlib_metadata-4.11.4-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6 + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.5.0-py3-none-any.whl + - pip3 install keyring-23.5.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.0-py3-no… - sha256: b0d28928ac3ec8e42ef4cc227822647a19f1d544f21f96457965dc01cf555261 + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.1-py3-no… + sha256: 9ef58314bcc823f426b49ec787539a2d73571b37de4cd498f839803b01acff1e - name: python3-css-parser buildsystem: simple @@ -264,8 +264,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.0.tar.gz - sha256: f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97 + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.1.tar.gz + sha256: 7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0 # sentry-sdk dependency - name: python3-urllib3 @@ -280,29 +280,29 @@ modules: - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2021.10.8-py2.py3-none-any.whl + - pip3 install certifi-2022.5.18.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/c/certifi/certifi-2021.10.8… - sha256: d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569 + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.5.18.1-p… + sha256: f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.5.11-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.5.12-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… - sha256: c17179183cac614e900cbd048dab03f49a48e2820182ec686c25e7ce46f8548f + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… + sha256: 778b53f0a6c83b1ee43d3b7886318ba86d975e686cb2c7906ccc35b334360be1 - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-3.0.2-py3-none-any.whl + - pip3 install nbxmpp-3.1.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.0.2-py3-none-… - sha256: 713487fa86fb0598dd3536f9ee5edd04a9712b05b784e16ef3bef6ae7301183b + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.1.0-py3-none-… + sha256: 0020c12f3900ba9ef9de570c1ed3e83cbcab33cd163580bbe0a6708a6f91b5ec - name: gajim buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/abde1e9e2de10bf24aa388c68d182e8c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/abde1e9e2de10bf24aa388c68d182e8c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: fix: WorkspaceDialog: Disable Remove button for last workspace
by Daniel Brötzmann (＠wurstsalat) 31 May '22

31 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1e8c130a by wurstsalat at 2022-05-31T20:10:34+02:00 fix: WorkspaceDialog: Disable Remove button for last workspace - - - - - 0eabdb01 by wurstsalat at 2022-05-31T20:10:34+02:00 imprv: Workspaces: Add Move to new workspace functionality This allows moving chats to a new workspace by either selecting the 'move to' menu item or by dropping them on the 'new workspace' icon in the sidebar - - - - - 780e6fe3 by wurstsalat at 2022-05-31T20:12:14+02:00 chore: Add HistorySyncAssistant to pyrightconfig - - - - - 6 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py - pyrightconfig.json Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -90,6 +90,7 @@ def _add_actions(self) -> None: actions = [ ('toggle-chat-pinned', 'a{sv}', self._toggle_chat_pinned), ('move-chat-to-workspace', 'a{sv}', self._move_chat_to_workspace), + ('move-chat-to-new-workspace', 'a{sv}', self._move_chat_to_new_workspace), ('mark-as-read', 'a{sv}', self._mark_as_read), ] @@ -230,6 +231,13 @@ def _move_chat_to_workspace(self, self.store_open_chats(current_chatlist.workspace_id) self.store_open_chats(params.workspace_id) + @structs.actionmethod + def _move_chat_to_new_workspace(self, + _action: Gio.SimpleAction, + params: structs.AccountJidParam + ) -> None: + app.window.move_chat_to_new_workspace(params.account, params.jid) + @structs.actionmethod def _mark_as_read(self, _action: Gio.SimpleAction, ===================================== gajim/gtk/main.py ===================================== @@ -15,8 +15,9 @@ from __future__ import annotations from typing import Any -from typing import Optional +from typing import cast from typing import Generator +from typing import Optional import logging import os @@ -530,6 +531,24 @@ def get_chat_list(self, workspace_id: str) -> ChatList: chat_list_stack = self._chat_page.get_chat_list_stack() return chat_list_stack.get_chatlist(workspace_id) + def move_chat_to_new_workspace(self, + account: str, + jid: JID + ) -> None: + chat_list_stack = self._chat_page.get_chat_list_stack() + current_chatlist = cast(ChatList, chat_list_stack.get_visible_child()) + type_ = current_chatlist.get_chat_type(account, jid) + if type_ is None: + return + current_chatlist.remove_chat(account, jid) + + workspace_id = app.settings.add_workspace(_('My Workspace')) + app.window.add_workspace(workspace_id) + new_chatlist = self.get_chat_list(workspace_id) + new_chatlist.add_chat(account, jid, type_) + chat_list_stack.store_open_chats(current_chatlist.workspace_id) + chat_list_stack.store_open_chats(workspace_id) + def _add_group_chat(self, _action: Gio.SimpleAction, param: GLib.Variant) -> None: ===================================== gajim/gtk/menus.py ===================================== @@ -428,12 +428,16 @@ def get_chat_list_row_menu(workspace_id: str, toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') menu.add_item(toggle_label, 'win.toggle-chat-pinned', params) + submenu = menu.add_submenu(_('Move Chat')) workspaces = app.settings.get_workspaces() if len(workspaces) > 1: - submenu = menu.add_submenu(_('Move Chat')) for name, params in get_workspace_params(workspace_id, account, jid): submenu.add_item(name, 'win.move-chat-to-workspace', params) + params = AccountJidParam(account=account, jid=jid) + submenu.add_item( + _('New Workspace'), 'win.move-chat-to-new-workspace', params) + if can_add_to_roster(contact): params = AccountJidParam(account=account, jid=jid) menu.add_item(_('Add to Contact List…'), 'win.add-to-roster', params) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -56,7 +56,8 @@ def __init__(self, workspace_id: Optional[str] = None) -> None: color: Optional[str] = None self._avatar_sha: Optional[str] = None - if workspace_id is None: + workspaces = app.settings.get_workspaces() + if workspace_id is None or len(workspaces) == 1: self._ui.remove_workspace_button.set_sensitive(False) else: name = app.settings.get_workspace_setting( ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -149,13 +149,16 @@ def _process_workspace_drop(self, workspace_id: str) -> None: def _process_chat_list_drop(self, identifier: str, y_coord: int) -> None: account, jid = identifier.split() + jid = JID.from_string(jid) workspace_row = cast(Workspace, self.get_row_at_y(y_coord)) if workspace_row.workspace_id == 'add': + app.window.move_chat_to_new_workspace( + account, jid) return params = ChatListEntryParam(workspace_id=workspace_row.workspace_id, account=account, - jid=JID.from_string(jid)) + jid=jid) app.window.activate_action('move-chat-to-workspace', params.to_variant()) ===================================== pyrightconfig.json ===================================== @@ -82,6 +82,7 @@ "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", "gajim/gtk/history_export.py", + "gajim/gtk/history_sync.py", "gajim/gtk/main_stack.py", "gajim/gtk/main.py", "gajim/gtk/mam_preferences.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e2ef26a4fe71d8f21207e4603c20e50… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e2ef26a4fe71d8f21207e4603c20e50… 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