[gnome-shell/drop-portal: 63/63] data: Stop providing an Access portal backend



commit b0362945f4404fe270ad3aabe9282c5100066b26
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Dec 5 23:10:54 2019 -0500

    data: Stop providing an Access portal backend
    
    A portal review by the design team has concluded that
    it is better to have all portals as application-modal
    GTK dialogs, instead of mixing them with some system-modal
    shell dialogs.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/issues/1994

 .../org.freedesktop.impl.portal.Access.xml         |  15 --
 data/gnome-shell-dbus-interfaces.gresource.xml     |   1 -
 data/gnome-shell.portal                            |   4 -
 data/meson.build                                   |   1 -
 js/js-resources.gresource.xml                      |   1 -
 js/ui/accessDialog.js                              | 156 ---------------------
 js/ui/main.js                                      |   5 +-
 meson.build                                        |   1 -
 po/POTFILES.in                                     |   1 -
 9 files changed, 1 insertion(+), 184 deletions(-)
---
diff --git a/data/gnome-shell-dbus-interfaces.gresource.xml b/data/gnome-shell-dbus-interfaces.gresource.xml
index db3ef4ac22..92a8d3d27f 100644
--- a/data/gnome-shell-dbus-interfaces.gresource.xml
+++ b/data/gnome-shell-dbus-interfaces.gresource.xml
@@ -9,7 +9,6 @@
     <file preprocess="xml-stripblanks">org.freedesktop.DBus.xml</file>
     <file preprocess="xml-stripblanks">org.freedesktop.GeoClue2.Agent.xml</file>
     <file preprocess="xml-stripblanks">org.freedesktop.GeoClue2.Manager.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.impl.portal.Access.xml</file>
     <file preprocess="xml-stripblanks">org.freedesktop.impl.portal.PermissionStore.xml</file>
     <file preprocess="xml-stripblanks">org.freedesktop.impl.portal.Request.xml</file>
     <file preprocess="xml-stripblanks">org.freedesktop.login1.Manager.xml</file>
diff --git a/data/meson.build b/data/meson.build
index ee4b1abbf9..553c5c956c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -72,7 +72,6 @@ configure_file(
 )
 
 
-install_data('gnome-shell.portal', install_dir: portaldir)
 install_data('50-gnome-shell-system.xml', install_dir: keysdir)
 
 
diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
index aec3427e0b..5f8be8fac4 100644
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -32,7 +32,6 @@
     <file>perf/core.js</file>
     <file>perf/hwtest.js</file>
 
-    <file>ui/accessDialog.js</file>
     <file>ui/altTab.js</file>
     <file>ui/animation.js</file>
     <file>ui/appDisplay.js</file>
diff --git a/js/ui/main.js b/js/ui/main.js
index 09b0249aa7..18b705dd0c 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -2,7 +2,7 @@
 /* exported componentManager, notificationDaemon, windowAttentionHandler,
             ctrlAltTabManager, padOsdService, osdWindowManager,
             osdMonitorLabeler, shellMountOpDBusService, shellDBusService,
-            shellAccessDialogDBusService, shellAudioSelectionDBusService,
+            shellAudioSelectionDBusService,
             screenSaverDBus, screencastService, uiGroup, magnifier,
             xdndHandler, keyboard, kbdA11yDialog, introspectService,
             start, pushModal, popModal, activateWindow, createLookingGlass,
@@ -10,7 +10,6 @@
 
 const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 
-const AccessDialog = imports.ui.accessDialog;
 const AudioDeviceSelection = imports.ui.audioDeviceSelection;
 const Components = imports.ui.components;
 const CtrlAltTab = imports.ui.ctrlAltTab;
@@ -68,7 +67,6 @@ var padOsdService = null;
 var osdWindowManager = null;
 var osdMonitorLabeler = null;
 var sessionMode = null;
-var shellAccessDialogDBusService = null;
 var shellAudioSelectionDBusService = null;
 var shellDBusService = null;
 var shellMountOpDBusService = null;
@@ -137,7 +135,6 @@ function start() {
     St.Settings.get().connect('notify::gtk-theme', _loadDefaultStylesheet);
     _initializeUI();
 
-    shellAccessDialogDBusService = new AccessDialog.AccessDialogDBus();
     shellAudioSelectionDBusService = new AudioDeviceSelection.AudioDeviceSelectionDBus();
     shellDBusService = new ShellDBus.GnomeShell();
     shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();
diff --git a/meson.build b/meson.build
index 1ee2107036..91724d8eaf 100644
--- a/meson.build
+++ b/meson.build
@@ -57,7 +57,6 @@ convertdir = join_paths(datadir, 'GConf', 'gsettings')
 desktopdir = join_paths(datadir, 'applications')
 ifacedir = join_paths(datadir, 'dbus-1', 'interfaces')
 localedir = join_paths(datadir, 'locale')
-portaldir = join_paths(datadir, 'xdg-desktop-portal', 'portals')
 schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 servicedir = join_paths(datadir, 'dbus-1', 'services')
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c8d6c03de0..cb94a34386 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,6 @@ js/gdm/util.js
 js/misc/systemActions.js
 js/misc/util.js
 js/portalHelper/main.js
-js/ui/accessDialog.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js
 js/ui/audioDeviceSelection.js


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]