From a01b44f7de558954111836a59ee35e7e60c0303d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 16 Aug 2017 21:27:33 +0200
Subject: [PATCH] data: Replace override schema with per-desktop override

GSettings now recognizes per-desktop overrides that can be used
to change schemas' default values for classic mode, so use that
instead of the separate override schema we currently use with
mutter's custom override mechanism.

https://bugzilla.gnome.org/show_bug.cgi?id=786496
---
 ....shell.extensions.classic.gschema.override |  5 ++
 data/meson.build                              |  4 +-
 ...l.extensions.classic-overrides.gschema.xml | 46 -------------------
 po/POTFILES.in                                |  1 -
 4 files changed, 7 insertions(+), 49 deletions(-)
 create mode 100644 data/00_org.gnome.shell.extensions.classic.gschema.override
 delete mode 100644 data/org.gnome.shell.extensions.classic-overrides.gschema.xml

diff --git a/data/00_org.gnome.shell.extensions.classic.gschema.override b/data/00_org.gnome.shell.extensions.classic.gschema.override
new file mode 100644
index 00000000..be8cdb73
--- /dev/null
+++ b/data/00_org.gnome.shell.extensions.classic.gschema.override
@@ -0,0 +1,5 @@
+[org.gnome.mutter:GNOME-Classic]
+dynamic-workspaces=false
+
+[org.gnome.desktop.wm.preferences:GNOME-Classic]
+button-layout='appmenu:minimize,maximize,close'
diff --git a/data/meson.build b/data/meson.build
index a807a3da..02ddf7d0 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -59,5 +59,5 @@ custom_target(style + '.css',
 
 install_data(theme_data, install_dir: themedir)
 
-classic_schema = 'org.gnome.shell.extensions.classic-overrides.gschema.xml'
-install_data(classic_schema, install_dir: schemadir)
+classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'
+install_data(classic_override, install_dir: schemadir)
diff --git a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml b/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
deleted file mode 100644
index 83b89d92..00000000
--- a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<schemalist>
-  <schema id="org.gnome.shell.extensions.classic-overrides"
-          path="/org/gnome/shell/extensions/classic-overrides/"
-	  gettext-domain="gnome-shell-extensions">
-    <key name="attach-modal-dialogs" type="b">
-      <default>true</default>
-      <summary>Attach modal dialog to the parent window</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running
-        GNOME Shell.
-      </description>
-    </key>
-
-    <key name="button-layout" type="s">
-      <default>"appmenu:minimize,maximize,close"</default>
-      <summary>Arrangement of buttons on the titlebar</summary>
-      <description>
-        This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell.
-      </description>
-    </key>
-
-    <key name="edge-tiling" type="b">
-      <default>true</default>
-      <summary>Enable edge tiling when dropping windows on screen edges</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
-    </key>
-
-    <key name="workspaces-only-on-primary" type="b">
-      <default>true</default>
-      <summary>Workspaces only on primary monitor</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
-    </key>
-
-    <key name="focus-change-on-pointer-rest" type="b">
-      <default>true</default>
-      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d98ca1bc..c2b88992 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 data/gnome-classic.desktop.in
 data/gnome-classic.session.desktop.in
-data/org.gnome.shell.extensions.classic-overrides.gschema.xml
 extensions/alternate-tab/prefs.js
 extensions/apps-menu/extension.js
 extensions/auto-move-windows/extension.js