3.29.3+really3.28.1-1

Hard-code compatible Shell versions for this branch
${gnome:Version} doesn't understand the +really workaround.
2018-07-27 23:48:06 +01:00 · 2018-07-27 23:46:52 +01:00 · 2018-07-27 23:20:57 +01:00 · 2018-07-27 23:20:52 +01:00 · 2018-07-27 23:20:47 +01:00
23 changed files with 183 additions and 203 deletions
--- a/21
+++ b/21
@@ -1,24 +1,3 @@
-3.29.90
-=======
-* Misc. bug fixes [Florian; #786496]
-
-Contributors:
-  Florian Müllner
-
-3.29.3
-======
-* Adjust to global.screen removal [Jonas; #759538]
-
-Contributors:
-  Jonas Ådahl, Florian Müllner
-
-3.29.2
-======
-* Misc. bug fixes [Florian; #69]
-
-Contributors:
-  Florian Müllner
-
 3.28.1
 ======
 * Misc. bug fixes [Xiaoguang, Florian; #59, #62]
--- a/data/00_org.gnome.shell.extensions.classic.gschema.override
+++ b/data/00_org.gnome.shell.extensions.classic.gschema.override
@@ -1,9 +0,0 @@
-[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/HACKING
+++ b/data/gnome-shell-sass/HACKING
@@ -0,0 +1,6 @@
+--- Generating the css file ---
+
+You need sass to generate the css file.
+
+To generate them run from a command line in the project directory:
+sass --sourcemap=none --update ./
--- a/data/gnome-shell-sass/README
+++ b/data/gnome-shell-sass/README
@@ -0,0 +1,7 @@
+GNOME Shell Sass is a project intended to allow the sharing of the theme sources in sass between gnome-shell and other projects like gnome-shell-extensions.
+
+License
+=======
+GNOME Shell Sass is distributed under the terms of the GNU General Public License,
+version 2 or later. See the COPYING file for details.
+
--- a/data/gnome-shell-sass/README.md
+++ b/data/gnome-shell-sass/README.md
@@ -1,16 +0,0 @@
-# GNOME Shell Sass
-GNOME Shell Sass is a project intended to allow the sharing of the
-theme sources in sass between gnome-shell and other projects like
-gnome-shell-extensions.
-
-Any changes should be done in the [GNOME Shell subtree][shell-subtree]
-and not the stand-alone [gnome-shell-sass repository][sass-repo]. They
-will then be synchronized periodically before releases.
-
-## License
-GNOME Shell Sass is distributed under the terms of the GNU General Public
-License, version 2 or later. See the [COPYING][license] file for details.
-
-[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/master/data/theme/gnome-shell-sass
-[sass-repo]: https://gitlab.gnome.org/GNOME/gnome-shell-sass
-[license]: COPYING
--- a/data/gnome-shell-sass/_common.scss
+++ b/data/gnome-shell-sass/_common.scss
@@ -128,15 +128,12 @@ StScrollBar {

 .slider {
  height: 1em;
-  -barlevel-height: 0.3em;
-  -barlevel-background-color: $insensitive_bg_color; //background of the trough
-  -barlevel-border-color: $borders_color; //trough border color
-  -barlevel-active-background-color: $selected_bg_color; //active trough fill
-  -barlevel-active-border-color: darken($selected_bg_color,10%); //active trough border
-  -barlevel-overdrive-color: $destructive_color;
-  -barlevel-overdrive-border-color: darken($destructive_color,10%);
-  -barlevel-overdrive-separator-width: 0.2em;
-  -barlevel-border-width: 1px;
+  -slider-height: 0.3em;
+  -slider-background-color: $insensitive_bg_color; //background of the trough
+  -slider-border-color: $borders_color; //trough border color
+  -slider-active-background-color: $selected_bg_color; //active trough fill
+  -slider-active-border-color: darken($selected_bg_color,10%); //active trough border
+  -slider-border-width: 1px;
  -slider-handle-radius: 6px;
 }

@@ -588,11 +585,13 @@ StScrollBar {
  .osd-monitor-label { font-size: 3em; }
  .level {
    height: 0.6em;
-    -barlevel-height: 0.6em;
-    -barlevel-background-color: transparentize(darken($osd_bg_color,15%),0.5);
-    -barlevel-active-background-color: $osd_fg_color;
-    -barlevel-overdrive-color: $destructive_color;
-    -barlevel-overdrive-separator-width: 0.2em;
+    border-radius: 0.3em;
+    background-color: transparentize(darken($osd_bg_color,15%),0.5);
+    color: $osd_fg_color;
+  }
+  .level-bar {
+    background-color: $osd_fg_color;
+    border-radius: 0.3em;
  }
 }

@@ -734,7 +733,6 @@ StScrollBar {
  transition-duration: 500ms;
  font-weight: bold;
  height: 1.86em;
-  font-feature-settings: "tnum";

  &.unlock-screen,
  &.login-screen,
@@ -826,8 +824,6 @@ StScrollBar {

  .screencast-indicator { color: $warning_color; }

-  .remote-access-indicator { color: $warning_color; }
-
  &.solid {
    background-color: black;
    /* transition from transparent to solid */
@@ -962,7 +958,6 @@ StScrollBar {
      padding: 0.1em;
      margin: 2px;
      border-radius: 1.4em;
-      font-feature-settings: "tnum";
      &:hover,&:focus { background-color: lighten($bg_color,5%); }
      &:active,&:selected {
        color: lighten($selected_fg_color,5%);
@@ -1116,7 +1111,7 @@ StScrollBar {
  .aggregate-menu {
    min-width: 21em;
    .popup-menu-icon { padding: 0 4px; }
-    .popup-sub-menu .popup-menu-item > :first-child {
+    .popup-sub-menu .popup-menu-item :first-child {
      &:ltr { /* 12px spacing + 2*4px padding */
              padding-left: 20px; margin-left: 1.09em; }
      &:rtl { /* 12px spacing + 2*4px padding */
@@ -1125,7 +1120,6 @@ StScrollBar {
  }

  .system-menu-action {
-    -st-icon-style: symbolic;
    color: $fg_color;
    border-radius: 32px; /* wish we could do 50% */
    padding: 13px;
@@ -1794,19 +1788,20 @@ StScrollBar {
  .login-dialog-user-list-view { -st-vfade-offset: 1em; }
  .login-dialog-user-list {
    spacing: 12px;
+    padding: .2em;
    width: 23em;
    &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
    &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
  }
  .login-dialog-user-list-item {
    border-radius: 5px;
-    padding: 6px;
+    padding: .2em;
    color: darken($osd_fg_color,30%);
-    &:ltr .user-widget { padding-right: 1em; }
-    &:rtl .user-widget { padding-left: 1em; }
+    &:ltr { padding-right: 1em; }
+    &:rtl { padding-left: 1em; }
    .login-dialog-timed-login-indicator {
      height: 2px;
-      margin-top: 6px;
+      margin: 2px 0 0 0;
      background-color: $osd_fg_color;
    }
    &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
@@ -1821,8 +1816,8 @@ StScrollBar {
    padding-left: 15px;
  }
    .user-widget-label {
-      &:ltr { padding-left: 14px; }
-      &:rtl { padding-right: 14px; }
+      &:ltr { padding-left: 18px; }
+      &:rtl { padding-right: 18px; }
    }

  .login-dialog-prompt-layout {
@@ -1873,7 +1868,6 @@ StScrollBar {
 .screen-shield-clock-time {
  font-size: 72pt;
  text-shadow: 0px 2px 2px rgba(0,0,0,0.4);
-  font-feature-settings: "tnum";
 }

 .screen-shield-clock-date { 
--- a/data/meson.build
+++ b/data/meson.build
@@ -59,5 +59,5 @@ custom_target(style + '.css',

 install_data(theme_data, install_dir: themedir)

-classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'
-install_data(classic_override, install_dir: schemadir)
+classic_schema = 'org.gnome.shell.extensions.classic-overrides.gschema.xml'
+install_data(classic_schema, install_dir: schemadir)
--- a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
+++ b/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
@@ -0,0 +1,46 @@
+<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/debian/changelog
+++ b/debian/changelog
@@ -1,32 +1,14 @@
-gnome-shell-extensions (3.29.90-1) experimental; urgency=medium
+gnome-shell-extensions (3.29.3+really3.28.1-1) unstable; urgency=medium

  * Team upload
-  * New upstream development release
-
- -- Simon McVittie <smcv@debian.org>  Thu, 02 Aug 2018 10:46:44 +0100
-
-gnome-shell-extensions (3.29.3+really3.29.3-1) experimental; urgency=medium
-
-  * Team upload
-  * d/watch: Watch for development versions
-  * Re-upload to experimental with a higher version than
-    3.29.3+really3.28.1-1, which reverted the incorrect upload of the
-    previous version to unstable
-
- -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 23:56:10 +0100
-
-gnome-shell-extensions (3.29.3-1) unstable; urgency=medium
-
-  * Team upload
-
-  [ Arnaud Rebillout ]
-  * New upstream release
-
-  [ Simon McVittie ]
+  * Revert unintended upload of 3.29.3 to unstable
+  * d/gbp.conf: Use debian/unstable and upstream/3.28.x branches
  * Bump Standards-Version to 4.1.5
  * Set Rules-Requires-Root to no
+  * Hard-code compatible Shell versions for this branch since
+    ${gnome:Version} doesn't understand the +really workaround

- -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 09:37:34 +0100
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 23:47:37 +0100

 gnome-shell-extensions (3.28.1-1) unstable; urgency=medium

--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
 Package: gnome-shell-extensions
 Architecture: all
 Depends: ${misc:Depends},
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= 3.28),
+         gnome-shell (<< 3.29),
         gir1.2-atk-1.0,
         gir1.2-clutter-1.0,
         gir1.2-gdkpixbuf-2.0,
--- a/debian/control.in
+++ b/debian/control.in
@@ -16,8 +16,8 @@ Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
 Package: gnome-shell-extensions
 Architecture: all
 Depends: ${misc:Depends},
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= 3.28),
+         gnome-shell (<< 3.29),
         gir1.2-atk-1.0,
         gir1.2-clutter-1.0,
         gir1.2-gdkpixbuf-2.0,
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = debian/unstable
+upstream-branch = upstream/3.28.x
 upstream-vcs-tag = %(version)s
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
 	@PACKAGE@@ANY_VERSION@\.tar\.xz
--- a/export-zips.sh
+++ b/export-zips.sh
@@ -22,7 +22,6 @@ for f in $extensiondir/*; do
  schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml

  cp $srcdir/NEWS $srcdir/COPYING $f
-  cp -r $localedir $f

  if [ -f $schema ]; then
    mkdir $f/schemas
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -31,7 +31,7 @@ function enable() {
        return injections['_keyPressHandler'].call(this, keysym, action);
    };

-    Main.wm._forcedWindowSwitcher = function(display, window, binding) {
+    Main.wm._forcedWindowSwitcher = function(display, screen, window, binding) {
        /* prevent a corner case where both popups show up at once */
        if (this._workspaceSwitcherPopup != null)
            this._workspaceSwitcherPopup.destroy();
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -79,10 +79,9 @@ class WindowMover {
            return;

        // ensure we have the required number of workspaces
-        let workspaceManager = global.workspace_manager;
-        for (let i = workspaceManager.n_workspaces; i <= workspaceNum; i++) {
+        for (let i = global.screen.n_workspaces; i <= workspaceNum; i++) {
            window.change_workspace_by_index(i - 1, false);
-            workspaceManager.append_new_workspace(false, 0);
+            global.screen.append_new_workspace(false, 0);
        }

        window.change_workspace_by_index(workspaceNum, false);
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -175,11 +175,11 @@ class DriveMenu extends PanelMenu.Button {
    }

    destroy() {
-        if (this._addedId) {
-            this._monitor.disconnect(this._addedId);
-            this._monitor.disconnect(this._removedId);
-            this._addedId = 0;
-            this._removedId = 0;
+        if (this._connectedId) {
+            this._monitor.disconnect(this._connectedId);
+            this._monitor.disconnect(this._disconnectedId);
+            this._connectedId = 0;
+            this._disconnectedId = 0;
        }

        super.destroy();
--- a/extensions/screenshot-window-sizer/extension.js
+++ b/extensions/screenshot-window-sizer/extension.js
@@ -69,7 +69,7 @@ let SIZES = [
    [1600, 900]
 ];

-function cycleScreenshotSizes(display, window, binding) {
+function cycleScreenshotSizes(display, screen, window, binding) {
    // Probably this isn't useful with 5 sizes, but you can decrease instead
    // of increase by holding down shift.
    let modifiers = binding.get_modifiers();
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -238,10 +238,10 @@ class BaseButton {

        if (this._perMonitor) {
            this._windowEnteredMonitorId =
-                global.display.connect('window-entered-monitor',
+                global.screen.connect('window-entered-monitor',
                    this._windowEnteredOrLeftMonitor.bind(this));
            this._windowLeftMonitorId =
-                global.display.connect('window-left-monitor',
+                global.screen.connect('window-left-monitor',
                    this._windowEnteredOrLeftMonitor.bind(this));
        }
    }
@@ -282,12 +282,12 @@ class BaseButton {
            this.actor.remove_style_class_name('focused');
    }

-    _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(metaScreen, monitorIndex, metaWindow) {
        throw new Error('Not implemented');
    }

    _isWindowVisible(window) {
-        let workspace = global.workspace_manager.get_active_workspace();
+        let workspace = global.screen.get_active_workspace();

        return !window.skip_taskbar &&
               window.located_on_workspace(workspace) &&
@@ -315,11 +315,11 @@ class BaseButton {
        global.window_manager.disconnect(this._switchWorkspaceId);

        if (this._windowEnteredMonitorId)
-            global.display.disconnect(this._windowEnteredMonitorId);
+            global.screen.disconnect(this._windowEnteredMonitorId);
        this._windowEnteredMonitorId = 0;

        if (this._windowLeftMonitorId)
-            global.display.disconnect(this._windowLeftMonitorId);
+            global.screen.disconnect(this._windowLeftMonitorId);
        this._windowLeftMonitorId = 0;
    }
 };
@@ -377,7 +377,7 @@ class WindowButton extends BaseButton {
            this.actor.remove_style_class_name('minimized');
    }

-    _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(metaScreen, monitorIndex, metaWindow) {
        if (monitorIndex == this._monitorIndex && metaWindow == this.metaWindow)
            this._updateVisibility();
    }
@@ -518,7 +518,7 @@ class AppButton extends BaseButton {
        this._updateStyle();
    }

-    _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(metaScreen, monitorIndex, metaWindow) {
        if (this._windowTracker.get_window_app(metaWindow) == this.app &&
            monitorIndex == this._monitorIndex) {
            this._updateVisibility();
@@ -529,7 +529,7 @@ class AppButton extends BaseButton {
    _updateVisibility() {
        if (!this._perMonitor) {
            // fast path: use ShellApp API to avoid iterating over all windows.
-            let workspace = global.workspace_manager.get_active_workspace();
+            let workspace = global.screen.get_active_workspace();
            this.actor.visible = this.app.is_on_workspace(workspace);
        } else {
            this.actor.visible = this.getWindowList().length >= 1;
@@ -652,9 +652,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
                                        x_expand: true, y_expand: true });
        this.actor.add_actor(container);

-        let workspaceManager = global.workspace_manager;
-
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();
        this.statusLabel = new St.Label({ text: this._getStatusText(),
                                          x_align: Clutter.ActorAlign.CENTER,
                                          y_align: Clutter.ActorAlign.CENTER });
@@ -662,11 +660,11 @@ class WorkspaceIndicator extends PanelMenu.Button {

        this.workspacesItems = [];

-        this._workspaceManagerSignals = [];
-        this._workspaceManagerSignals.push(workspaceManager.connect('notify::n-workspaces',
-                                                                    this._updateMenu.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
-                                                                          this._updateIndicator.bind(this)));
+        this._screenSignals = [];
+        this._screenSignals.push(global.screen.connect('notify::n-workspaces',
+                                                       this._updateMenu.bind(this)));
+        this._screenSignals.push(global.screen.connect_after('workspace-switched',
+                                                             this._updateIndicator.bind(this)));

        this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
        this._updateMenu();
@@ -678,8 +676,8 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    destroy() {
-        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
-            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
+        for (let i = 0; i < this._screenSignals.length; i++)
+            global.screen.disconnect(this._screenSignals[i]);

        if (this._settingsChangedId) {
            this._settings.disconnect(this._settingsChangedId);
@@ -691,28 +689,25 @@ class WorkspaceIndicator extends PanelMenu.Button {

    _updateIndicator() {
        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();
        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);

        this.statusLabel.set_text(this._getStatusText());
    }

    _getStatusText() {
-        let workspaceManager = global.workspace_manager;
-        let current = workspaceManager.get_active_workspace().index();
-        let total = workspaceManager.n_workspaces;
+        let current = global.screen.get_active_workspace().index();
+        let total = global.screen.n_workspaces;

        return '%d / %d'.format(current + 1, total);
    }

    _updateMenu() {
-        let workspaceManager = global.workspace_manager;
-
        this.menu.removeAll();
        this.workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();

-        for(let i = 0; i < workspaceManager.n_workspaces; i++) {
+        for(let i = 0; i < global.screen.n_workspaces; i++) {
            let name = Meta.prefs_get_workspace_name(i);
            let item = new PopupMenu.PopupMenuItem(name);
            item.workspaceId = i;
@@ -732,10 +727,8 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    _activate(index) {
-        let workspaceManager = global.workspace_manager;
-
-        if(index >= 0 && index < workspaceManager.n_workspaces) {
-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
+        if(index >= 0 && index < global.screen.n_workspaces) {
+            let metaWorkspace = global.screen.get_workspace_by_index(index);
            metaWorkspace.activate(global.get_current_time());
        }
    }
@@ -799,12 +792,14 @@ 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._mutterSettings.connect('changed::workspaces-only-on-primary',
-                                         this._updateWorkspaceIndicatorVisibility.bind(this));
+            this._workspaceSettings.connect('changed::workspaces-only-on-primary',
+                                            this._updateWorkspaceIndicatorVisibility.bind(this));
+        this._dynamicWorkspacesSettings = this._getDynamicWorkspacesSettings();
        this._dynamicWorkspacesChangedId =
-            this._mutterSettings.connect('changed::dynamic-workspaces',
-                                         this._updateWorkspaceIndicatorVisibility.bind(this));
+            this._dynamicWorkspacesSettings.connect('changed::dynamic-workspaces',
+                                                    this._updateWorkspaceIndicatorVisibility.bind(this));
        this._updateWorkspaceIndicatorVisibility();

        this._menuManager = new PopupMenu.PopupMenuManager(this);
@@ -838,12 +833,10 @@ class WindowList {
                    this._updateKeyboardAnchor();
                });

-        let workspaceManager = global.workspace_manager;
-
        this._workspaceSignals = new Map();
        this._nWorkspacesChangedId =
-            workspaceManager.connect('notify::n-workspaces',
-                                     this._onWorkspacesChanged.bind(this));
+            global.screen.connect('notify::n-workspaces',
+                                  this._onWorkspacesChanged.bind(this));
        this._onWorkspacesChanged();

        this._switchWorkspaceId =
@@ -863,7 +856,7 @@ class WindowList {
            });

        this._fullscreenChangedId =
-            global.display.connect('in-fullscreen-changed', () => {
+            global.screen.connect('in-fullscreen-changed', () => {
                this._updateKeyboardAnchor();
            });

@@ -888,6 +881,19 @@ 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;
@@ -917,11 +923,10 @@ class WindowList {
    }

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

        this._workspaceIndicator.actor.visible = hasWorkspaces && workspacesOnMonitor;
    }
@@ -934,7 +939,7 @@ class WindowList {
        let [, childWidth] = children[0].get_preferred_width(-1);
        let spacing = this._windowList.layout_manager.spacing;

-        let workspace = global.workspace_manager.get_active_workspace();
+        let workspace = global.screen.get_active_workspace();
        let windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
        if (this._perMonitor)
            windows = windows.filter(w => w.get_monitor() == this._monitor.index);
@@ -1074,11 +1079,9 @@ class WindowList {
    }

    _onWorkspacesChanged() {
-        let workspaceManager = global.workspace_manager;
-        let numWorkspaces = workspaceManager.n_workspaces;
-
+        let numWorkspaces = global.screen.n_workspaces;
        for (let i = 0; i < numWorkspaces; i++) {
-            let workspace = workspaceManager.get_workspace_by_index(i);
+            let workspace = global.screen.get_workspace_by_index(i);
            if (this._workspaceSignals.has(workspace))
                continue;

@@ -1096,11 +1099,9 @@ class WindowList {
    }

    _disconnectWorkspaceSignals() {
-        let workspaceManager = global.workspace_manager;
-        let numWorkspaces = workspaceManager.n_workspaces;
-
+        let numWorkspaces = global.screen.n_workspaces;
        for (let i = 0; i < numWorkspaces; i++) {
-            let workspace = workspaceManager.get_workspace_by_index(i);
+            let workspace = global.screen.get_workspace_by_index(i);
            let signals = this._workspaceSignals.get(workspace);
            this._workspaceSignals.delete(workspace);
            workspace.disconnect(signals._windowAddedId);
@@ -1162,8 +1163,8 @@ class WindowList {
    }

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

        this._workspaceIndicator.destroy();

@@ -1178,7 +1179,7 @@ class WindowList {
        Main.layoutManager.hideKeyboard();

        this._disconnectWorkspaceSignals();
-        global.workspace_manager.disconnect(this._nWorkspacesChangedId);
+        global.screen.disconnect(this._nWorkspacesChangedId);
        this._nWorkspacesChangedId = 0;

        global.window_manager.disconnect(this._switchWorkspaceId);
@@ -1188,7 +1189,7 @@ class WindowList {
        Main.overview.disconnect(this._overviewShowingId);
        Main.overview.disconnect(this._overviewHidingId);

-        global.display.disconnect(this._fullscreenChangedId);
+        global.screen.disconnect(this._fullscreenChangedId);

        Main.xdndHandler.disconnect(this._dragBeginId);
        Main.xdndHandler.disconnect(this._dragEndId);
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -135,16 +135,14 @@ function enable() {
        if(Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
            return false;

-        let workspaceManager = global.workspace_manager;
-
        if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
             o.get_key_symbol() == Clutter.KEY_Alt_R)
            && !this._pickWorkspace) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
-            this._active = workspaceManager.get_active_workspace_index();
+            this._active = global.screen.get_active_workspace_index();
            this._pickWindow = true;
-            this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
+            this._workspaces[global.screen.get_active_workspace_index()].showWindowsTooltips();
            return true;
        }
        if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
@@ -168,7 +166,7 @@ function enable() {
            return true;

        if (this._pickWindow) {
-            if (this._active != workspaceManager.get_active_workspace_index()) {
+            if (this._active != global.screen.get_active_workspace_index()) {
                this._hideTooltips();
                return false;
            }
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -25,9 +25,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
    constructor() {
        super(0.0, _("Workspace Indicator"));

-        let workspaceManager = global.workspace_manager;
-
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();
        this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
                                          text: this._labelText() });

@@ -37,13 +35,12 @@ class WorkspaceIndicator extends PanelMenu.Button {
        this._workspaceSection = new PopupMenu.PopupMenuSection();
        this.menu.addMenuItem(this._workspaceSection);

-        this._workspaceManagerSignals = [];
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-added',
-                                                                          this._createWorkspacesSection.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-removed',
-                                                                          this._createWorkspacesSection.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
-                                                                          this._updateIndicator.bind(this)));
+        this._screenSignals = [];
+        this._screenSignals.push(global.screen.connect_after('workspace-added',                                                              this._createWorkspacesSection.bind(this)));
+        this._screenSignals.push(global.screen.connect_after('workspace-removed',
+                                                             this._createWorkspacesSection.bind(this)));
+        this._screenSignals.push(global.screen.connect_after('workspace-switched',
+                                                             this._updateIndicator.bind(this)));

        this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
        this._createWorkspacesSection();
@@ -58,8 +55,8 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    destroy() {
-        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
-            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
+        for (let i = 0; i < this._screenSignals.length; i++)
+            global.screen.disconnect(this._screenSignals[i]);

        if (this._settingsChangedId) {
            this._settings.disconnect(this._settingsChangedId);
@@ -71,7 +68,7 @@ class WorkspaceIndicator extends PanelMenu.Button {

    _updateIndicator() {
        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();
        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);

        this.statusLabel.set_text(this._labelText());
@@ -86,14 +83,12 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    _createWorkspacesSection() {
-        let workspaceManager = global.workspace_manager;
-
        this._workspaceSection.removeAll();
        this.workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();

        let i = 0;
-        for(; i < workspaceManager.n_workspaces; i++) {
+        for(; i < global.screen.n_workspaces; i++) {
            this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
            this._workspaceSection.addMenuItem(this.workspacesItems[i]);
            this.workspacesItems[i].workspaceId = i;
@@ -111,10 +106,8 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    _activate(index) {
-        let workspaceManager = global.workspace_manager;
-
-        if(index >= 0 && index <  workspaceManager.n_workspaces) {
-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
+        if(index >= 0 && index <  global.screen.n_workspaces) {
+            let metaWorkspace = global.screen.get_workspace_by_index(index);
            metaWorkspace.activate(global.get_current_time());
        }
    }
@@ -130,7 +123,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
            return;
        }

-        let newIndex = global.workspace_manager.get_active_workspace().index() + diff;
+        let newIndex = global.screen.get_active_workspace().index() + diff;
        this._activate(newIndex);
    }
 };
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.29.90',
+  version: '3.28.1',
  meson_version: '>= 0.44.0',
  license: 'GPL2+'
 )
@@ -34,6 +34,7 @@ endif
 uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'

 classic_extensions = [
+  'alternate-tab',
  'apps-menu',
  'places-menu',
  'launch-new-instance',
@@ -42,7 +43,6 @@ 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,5 +1,6 @@
 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
Simon McVittie	1a41467649	3.29.3+really3.28.1-1	2018-07-27 23:48:06 +01:00
Simon McVittie	27c4995ce9	Hard-code compatible Shell versions for this branch ${gnome:Version} doesn't understand the +really workaround.	2018-07-27 23:46:52 +01:00
Simon McVittie	d483f00cce	Set Rules-Requires-Root to no	2018-07-27 23:20:57 +01:00
Simon McVittie	e7c333b1a1	Bump Standards-Version to 4.1.5	2018-07-27 23:20:52 +01:00
Simon McVittie	1ffd854eb1	Revert unintended upload of 3.29.3 to unstable d/gbp.conf: Use debian/unstable and upstream/3.28.x branches	2018-07-27 23:20:47 +01:00