fix: stop using overlays.xdg-desktop-portal-kde
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
381fa3d101
commit
ac72cccb72
3 changed files with 4 additions and 33 deletions
|
@ -15,10 +15,9 @@ in {
|
||||||
"nixpkgs-wayland"
|
"nixpkgs-wayland"
|
||||||
])
|
])
|
||||||
++ (attrValues {
|
++ (attrValues {
|
||||||
inherit
|
# inherit
|
||||||
(self.overlays)
|
# (self.overlays)
|
||||||
xdg-desktop-portal-kde
|
# ;
|
||||||
;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
environment.systemPackages = remove null (attrValues {
|
environment.systemPackages = remove null (attrValues {
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp
|
|
||||||
index 44ceebcf..8146df20 100644
|
|
||||||
--- a/src/remotedesktop.cpp
|
|
||||||
+++ b/src/remotedesktop.cpp
|
|
||||||
@@ -22,6 +22,8 @@
|
|
||||||
#include <QDBusReply>
|
|
||||||
#include <QGuiApplication>
|
|
||||||
#include <QRegion>
|
|
||||||
+#include <KSharedConfig>
|
|
||||||
+#include <KConfigGroup>
|
|
||||||
#include <QScreen>
|
|
||||||
|
|
||||||
#include "permission_store.h"
|
|
||||||
@@ -224,7 +226,10 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle,
|
|
||||||
notification->setIconName(QStringLiteral("krfb"));
|
|
||||||
notification->sendEvent();
|
|
||||||
} else {
|
|
||||||
- if (!isAppMegaAuthorized(app_id)) { // authorize right away
|
|
||||||
+ auto cfg = KSharedConfig::openConfig(QStringLiteral("plasmaremotedesktoprc"));
|
|
||||||
+ const auto unattendedAccess = cfg->group("Sharing").readEntry("Unattended", false);
|
|
||||||
+ if (!unattendedAccess || !isAppMegaAuthorized(app_id)) // authorize right away
|
|
||||||
+ {
|
|
||||||
QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
|
||||||
new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled(), session->persistMode()));
|
|
||||||
Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
|
||||||
|
|
|
@ -7,9 +7,7 @@
|
||||||
then ./6-1-3.patch
|
then ./6-1-3.patch
|
||||||
else if builtins.compareVersions o.version "6.3.0" == -1
|
else if builtins.compareVersions o.version "6.3.0" == -1
|
||||||
then ./6-2.patch
|
then ./6-2.patch
|
||||||
# TODO: this patch is not necessary anymore
|
else throw "This patch is not working or needed anymore. Please see https://develop.kde.org/docs/administration/portal-permissions/";
|
||||||
# https://develop.kde.org/docs/administration/portal-permissions/
|
|
||||||
else ./6-3.patch;
|
|
||||||
in
|
in
|
||||||
(o.patches or [])
|
(o.patches or [])
|
||||||
++ [
|
++ [
|
||||||
|
|
Loading…
Add table
Reference in a new issue