Bump version to 3.29.90

Update NEWS.
Update sass submodule
2018-08-01 03:47:30 +02:00 · 2018-08-01 03:46:05 +02:00 · 2018-07-09 19:18:54 +02:00 · 2018-07-09 19:18:54 +02:00 · 2018-07-09 19:18:54 +02:00
8 changed files with 29 additions and 75 deletions
--- a/7
+++ b/7
@@ -1,3 +1,10 @@
+3.29.90
+=======
+* Misc. bug fixes [Florian; #786496]
+
+Contributors:
+  Florian Müllner
+
 3.29.3
 ======
 * Adjust to global.screen removal [Jonas; #759538]
--- a/data/00_org.gnome.shell.extensions.classic.gschema.override
+++ b/data/00_org.gnome.shell.extensions.classic.gschema.override
@@ -0,0 +1,9 @@
+[org.gnome.mutter:GNOME-Classic]
+dynamic-workspaces=false
+
+[org.gnome.desktop.wm.preferences:GNOME-Classic]
+button-layout='appmenu:minimize,maximize,close'
+
+[org.gnome.desktop.wm.keybindings:GNOME-Classic]
+switch-applications=[]
+switch-windows=['<Super>Tab','<Alt>Tab']
--- a/data/gnome-shell-sass
+++ b/data/gnome-shell-sass
--- 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)
--- a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
+++ b/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
@@ -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>
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -799,14 +799,12 @@ class WindowList {
        indicatorsBox.add(this._workspaceIndicator.container, { expand: false, y_fill: true });

        this._mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });
-        this._workspaceSettings = this._getWorkspaceSettings();
        this._workspacesOnlyOnPrimaryChangedId =
-            this._workspaceSettings.connect('changed::workspaces-only-on-primary',
-                                            this._updateWorkspaceIndicatorVisibility.bind(this));
-        this._dynamicWorkspacesSettings = this._getDynamicWorkspacesSettings();
+            this._mutterSettings.connect('changed::workspaces-only-on-primary',
+                                         this._updateWorkspaceIndicatorVisibility.bind(this));
        this._dynamicWorkspacesChangedId =
-            this._dynamicWorkspacesSettings.connect('changed::dynamic-workspaces',
-                                                    this._updateWorkspaceIndicatorVisibility.bind(this));
+            this._mutterSettings.connect('changed::dynamic-workspaces',
+                                         this._updateWorkspaceIndicatorVisibility.bind(this));
        this._updateWorkspaceIndicatorVisibility();

        this._menuManager = new PopupMenu.PopupMenuManager(this);
@@ -890,19 +888,6 @@ class WindowList {
        this._groupingModeChanged();
    }

-    _getDynamicWorkspacesSettings() {
-        if (this._workspaceSettings.list_keys().includes('dynamic-workspaces'))
-            return this._workspaceSettings;
-        return this._mutterSettings;
-    }
-
-    _getWorkspaceSettings() {
-        let settings = global.get_overrides_settings() || this._mutterSettings;
-        if (settings.list_keys().includes('workspaces-only-on-primary'))
-            return settings;
-        return this._mutterSettings;
-    }
-
    _onScrollEvent(actor, event) {
        let direction = event.get_scroll_direction();
        let diff = 0;
@@ -933,10 +918,10 @@ class WindowList {

    _updateWorkspaceIndicatorVisibility() {
        let workspaceManager = global.workspace_manager;
-        let hasWorkspaces = this._dynamicWorkspacesSettings.get_boolean('dynamic-workspaces') ||
+        let hasWorkspaces = this._mutterSettings.get_boolean('dynamic-workspaces') ||
                            workspaceManager.n_workspaces > 1;
        let workspacesOnMonitor = this._monitor == Main.layoutManager.primaryMonitor ||
-                                  !this._workspaceSettings.get_boolean('workspaces-only-on-primary');
+                                  !this._mutterSettings.get_boolean('workspaces-only-on-primary');

        this._workspaceIndicator.actor.visible = hasWorkspaces && workspacesOnMonitor;
    }
@@ -1177,8 +1162,8 @@ class WindowList {
    }

    _onDestroy() {
-        this._workspaceSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId);
-        this._dynamicWorkspacesSettings.disconnect(this._dynamicWorkspacesChangedId);
+        this._mutterSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId);
+        this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId);

        this._workspaceIndicator.destroy();

--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.29.3',
+  version: '3.29.90',
  meson_version: '>= 0.44.0',
  license: 'GPL2+'
 )
@@ -34,7 +34,6 @@ endif
 uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'

 classic_extensions = [
-  'alternate-tab',
  'apps-menu',
  'places-menu',
  'launch-new-instance',
@@ -43,6 +42,7 @@ classic_extensions = [

 default_extensions = classic_extensions
 default_extensions += [
+  'alternate-tab',
  'drive-menu',
  'screenshot-window-sizer',
  'windowsNavigator',
--- 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
Author	SHA1	Message	Date
Florian Müllner	8b1bcc9fed	Bump version to 3.29.90 Update NEWS.	2018-08-01 03:47:30 +02:00
Florian Müllner	ebad80c64d	Update sass submodule	2018-08-01 03:46:05 +02:00
Florian Müllner	39caf951e0	data: Use override for default alt-tab keybindings Per-desktop overrides aren't limited to keys in org.gnome.mutter, so we can use them instead of the alternate-tab extension to default to the window switcher in the classic session. https://bugzilla.gnome.org/show_bug.cgi?id=786496	2018-07-09 19:18:54 +02:00
Florian Müllner	ecf28e13b4	window-list: Use correct settings schemas Override schemas are gone (yay!), so we can now simply use the original schema independent from the used session mode. https://bugzilla.gnome.org/show_bug.cgi?id=786496	2018-07-09 19:18:54 +02:00
Florian Müllner	a01b44f7de	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	2018-07-09 19:18:54 +02:00