D20833: Simpler check for flatpak
This revision was automatically updated to reflect the committed changes. Closed by commit R289:458e4770d43f: Simpler check for flatpak (authored by apol). REPOSITORY R289 KNotifications CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D20833?vs=58848=58851 REVISION DETAIL https://phabricator.kde.org/D20833 AFFECTED FILES src/knotificationmanager.cpp To: apol, #frameworks, broulik Cc: jgrulich, broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D20833: Simpler check for flatpak
broulik accepted this revision. This revision is now accepted and ready to land. REPOSITORY R289 KNotifications BRANCH master REVISION DETAIL https://phabricator.kde.org/D20833 To: apol, #frameworks, broulik Cc: jgrulich, broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D20833: Simpler check for flatpak
apol updated this revision to Diff 58848. apol added a comment. A more compact approach REPOSITORY R289 KNotifications CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D20833?vs=57023=58848 BRANCH master REVISION DETAIL https://phabricator.kde.org/D20833 AFFECTED FILES src/knotificationmanager.cpp To: apol, #frameworks Cc: jgrulich, broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D20833: Simpler check for flatpak
jgrulich added a comment. Lookgs good to me, I'll wait for Kai to approve this since he is the maintainer. One thing to consider maybe, did /.flatpak-info always exist or is it something new? I always assumed there is just one flatpak-info file in $XDG_RUNTIME_DIR. Just to be sure it will work for older Flatpak versions. INLINE COMMENTS > broulik wrote in knotificationmanager.cpp:94 > Do you need this check now, even, since you're not using it anymore? I think Kai is right, since there is /.flatpak-info (which I didn't know about until now), you don't need to check $XDG_RUNTIME_DIR. REPOSITORY R289 KNotifications REVISION DETAIL https://phabricator.kde.org/D20833 To: apol, #frameworks Cc: jgrulich, broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D20833: Simpler check for flatpak
apol updated this revision to Diff 57023. apol added a comment. No need for inSandbox to be a class member REPOSITORY R289 KNotifications CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D20833?vs=56999=57023 BRANCH master REVISION DETAIL https://phabricator.kde.org/D20833 AFFECTED FILES src/knotificationmanager.cpp To: apol, #frameworks Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D20833: Simpler check for flatpak
apol added a comment. We still use it to check whether to initialise `portalDBusServiceExists`. I'll simplify it a bit. REPOSITORY R289 KNotifications REVISION DETAIL https://phabricator.kde.org/D20833 To: apol, #frameworks Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D20833: Simpler check for flatpak
broulik added inline comments.
INLINE COMMENTS
> knotificationmanager.cpp:94
>
> if (!qEnvironmentVariableIsEmpty("XDG_RUNTIME_DIR")) {
> +d->inSandbox = QFileInfo::exists(QLatin1String("/.flatpak-info"));
Do you need this check now, even, since you're not using it anymore?
REPOSITORY
R289 KNotifications
REVISION DETAIL
https://phabricator.kde.org/D20833
To: apol, #frameworks
Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D20833: Simpler check for flatpak
apol created this revision. apol added a reviewer: Frameworks. Herald added a project: Frameworks. Herald added a subscriber: kde-frameworks-devel. apol requested review of this revision. REVISION SUMMARY I saw it being checked like that, I think it reads a bit cleaner. REPOSITORY R289 KNotifications BRANCH master REVISION DETAIL https://phabricator.kde.org/D20833 AFFECTED FILES src/knotificationmanager.cpp To: apol, #frameworks Cc: kde-frameworks-devel, michaelh, ngraham, bruns
