From 40543bdd285dcb46e2af7879fce92b67f276ef60 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sat, 5 Jun 2021 09:22:00 -0300
Subject: [PATCH] portal: Own org.gnome.Shell.Portal for the access portal

org.freedesktop.impl.portal.desktop.gnome will be used for the
GNOME implementation of desktop portals in the future, so make
sure GNOME Shell's implementation of the access portal won't
conflict.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1872>
---
 data/gnome-shell.portal | 2 +-
 js/ui/accessDialog.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/gnome-shell.portal b/data/gnome-shell.portal
index b70463777..a7cd0d532 100644
--- a/data/gnome-shell.portal
+++ b/data/gnome-shell.portal
@@ -1,4 +1,4 @@
 [portal]
-DBusName=org.freedesktop.impl.portal.desktop.gnome
+DBusName=org.gnome.Shell.Portal
 Interfaces=org.freedesktop.impl.portal.Access
 UseIn=gnome
diff --git a/js/ui/accessDialog.js b/js/ui/accessDialog.js
index 0e417bda7..057cd5b1b 100644
--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@@ -124,7 +124,7 @@ var AccessDialogDBus = class {
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(AccessIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/portal/desktop');
 
-        Gio.DBus.session.own_name('org.freedesktop.impl.portal.desktop.gnome', Gio.BusNameOwnerFlags.REPLACE, null, null);
+        Gio.DBus.session.own_name('org.gnome.Shell.Portal', Gio.BusNameOwnerFlags.REPLACE, null, null);
     }
 
     AccessDialogAsync(params, invocation) {