1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always fallback opening URLs to the regular way if portal fails

Browse Source 
Even if the code fails, the runtime will have a xdg-open binary
that supports the required API (portals in flatpak and userd launcher
in snap)

Task-number: QTBUG-83939
Change-Id: I8527cfe20411c535686b7171ff9ef285ab9e10aa
Reviewed-by: Jan Grulich <jgrulich@redhat.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ilya Fedin 2021-09-29 13:08:10 +04:00
parent 46fc01d7ca
commit 62a81bddfa
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/platform/unix/qgenericunixservices.cpp
View File

@ -186,14 +186,6 @@ static inline bool checkNeedPortalSupport()
return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, QLatin1String("flatpak-info")).isEmpty() || qEnvironmentVariableIsSet("SNAP");
}
static inline bool isPortalReturnPermanent(const QDBusError &error)
{
// A service unknown error isn't permanent, it just indicates that we
// should fall back to the regular way. This check includes
// QDBusError::NoError.
return error.type() != QDBusError::ServiceUnknown && error.type() != QDBusError::AccessDenied;
}
static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
{
// DBus signature:
@ -312,8 +304,8 @@ bool QGenericUnixServices::openUrl(const QUrl &url)
#if QT_CONFIG(dbus)
if (checkNeedPortalSupport()) {
QDBusError error = xdgDesktopPortalSendEmail(url);
if (isPortalReturnPermanent(error))
return !error.isValid();
if (!error.isValid())
return true;
// service not running, fall back
}
@ -324,8 +316,8 @@ bool QGenericUnixServices::openUrl(const QUrl &url)
#if QT_CONFIG(dbus)
if (checkNeedPortalSupport()) {
QDBusError error = xdgDesktopPortalOpenUrl(url);
if (isPortalReturnPermanent(error))
return !error.isValid();
if (!error.isValid())
return true;
}
#endif
@ -341,8 +333,8 @@ bool QGenericUnixServices::openDocument(const QUrl &url)
#if QT_CONFIG(dbus)
if (checkNeedPortalSupport()) {
QDBusError error = xdgDesktopPortalOpenFile(url);
if (isPortalReturnPermanent(error))
return !error.isValid();
if (!error.isValid())
return true;
}
#endif