From fda938175e5d1adc8e81fe54e600f478cf9c3dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 5 Mar 2020 02:00:57 +0100
Subject: [PATCH] shellDBus: Add new OpenExtensionPrefs method

Unlike any other methods in the Extensions API, LaunchExtensionPrefs()
opens what appears to be an application dialog, except that it is
really a separate application that the caller has no control over.

In order to address that, add a new OpenExtensionPrefs() method that
takes additional parameters (modelled after the desktop portal APIs)
that will make it possible to improve the behavior in the future.

The new parameters are ignored for now, but pushing the API out now
will allow us to fill in the functionality post the .0 release.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1074
---
 .../org.gnome.Shell.Extensions.xml            | 29 +++++++++++++++++--
 js/ui/shellDBus.js                            |  4 +++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/data/dbus-interfaces/org.gnome.Shell.Extensions.xml b/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
index eb7be8f1a..ab80c1096 100644
--- a/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
@@ -199,14 +199,37 @@
 
     <!--
         LaunchExtensionPrefs:
-        @uuid: The UUID of the extension
-
-        Launch preferences of an extension.
+        Deprecated for OpenExtensionPrefs
     -->
     <method name="LaunchExtensionPrefs">
       <arg type="s" direction="in" name="uuid"/>
     </method>
 
+    <!--
+        OpenExtensionPrefs:
+        @uuid: The UUID of the extension
+        @parent_window: Identifier for the application window
+        @options: Vardict with further options
+
+        Opens the prefs dialog of extension @uuid.
+
+        The following @options are recognized:
+
+        <variablelist>
+          <varlistentry>
+            <term>modal b</term>
+            <listitem>
+              <para>Whether the prefs window should be modal, default: false</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="OpenExtensionPrefs">
+      <arg type="s" direction="in" name="uuid"/>
+      <arg type="s" direction="in" name="parent_window"/>
+      <arg type="a{sv}" direction="in" name="options"/>
+    </method>
+
     <!--
         CheckForUpdates:
         Update all extensions for which updates are available
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 691019b42..983a88712 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -312,6 +312,10 @@ var GnomeShellExtensions = class {
     }
 
     LaunchExtensionPrefs(uuid) {
+        this.OpenExtensionPrefs(uuid, '', {});
+    }
+
+    OpenExtensionPrefs(uuid, _parentWindow, _options) {
         let appSys = Shell.AppSystem.get_default();
         let app = appSys.lookup_app('org.gnome.Extensions.desktop');
         let info = app.get_app_info();