Philipp Hörist pushed to branch master at gajim / gajim

Commits:

4 changed files:

Changes:

  • flatpak/app-overrides.json
    1 
    +{
    2 
    +	"plugins_update_check": false,
    3 
    +	"plugins_auto_update": false,
    4 
    +	"plugins_repository_enabled": false
    5 
    +}

  • flatpak/org.gajim.Gajim.Devel.yaml
    ... ... @@ -317,11 +317,14 @@ modules:
    317 317 
         build-commands:
    318 318 
           - pip3 install .
    319 319 
           - touch /app/share/run-as-flatpak
    320 
    +      - cp -t ${FLATPAK_DEST} app-overrides.json
    320 321 
           - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel
    321 322 
           - chmod 755 /app/bin/gajim-devel
    322 323 
         sources:
    323 324 
           - type: git
    324 325 
             url: https://dev.gajim.org/gajim/gajim.git
    326 
    +      - type: file
    327 
    +        path: app-overrides.json
    325 328 
           - type: shell
    326 329 
             commands:
    327 330 
               - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in

  • flatpak/org.gajim.Gajim.yaml
    ... ... @@ -311,9 +311,12 @@ modules:
    311 311 
         build-commands:
    312 312 
           - pip3 install .
    313 313 
           - touch /app/share/run-as-flatpak
    314 
    +      - cp -t ${FLATPAK_DEST} app-overrides.json
    314 315 
         sources:
    315 316 
           - type: git
    316 317 
             url: https://dev.gajim.org/gajim/gajim.git
    317 318 
             tag: 1.4.4
    319 
    +      - type: file
    320 
    +        path: app-overrides.json
    318 321 
         post-install:
    319 322 
           - install -d /app/plugins

  • gajim/common/settings.py
    ... ... @@ -106,7 +106,10 @@
    106 106 
     _CallbackDict = dict[tuple[str, Optional[str], Optional[JID]],
    107 107 
                          list[weakref.WeakMethod[_SignalCallable]]]
    108 108
    109 
    -OVERRIDES_PATH = Path('/etc/gajim/app-overrides.json')
    109 
    +if app.is_flatpak():
    110 
    +    OVERRIDES_PATH = Path('/app/app-overrides.json')
    111 
    +else:
    112 
    +    OVERRIDES_PATH = Path('/etc/gajim/app-overrides.json')
    110 113
    111 114
    112 115 
     class Settings:

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.