releasing package gnome-shell-extensions version 42.1-0ubuntu1

NEWS

@@ -1,22 +1,3 @@
-42.3
-====
-* screenshot-window-sizer: Fix reported sizes on wayland [Florian; !232]
-* window-list: Improve touch support [Florian; !233]
-
-Contributors:
-  Florian Müllner
-
-42.2
-====
-* native-window-placement: Adjust to gnome-shell 42 changes [Florian; !229]
-* window-list: Fix visibility on non-primary monitors [Jason; !230]
-
-Contributors:
-  Jason Lynch, Florian Müllner
-
-Translators:
-  Cheng-Chia Tseng [zh_TW]
-
 42.1
 ====
 * Misc. bug fixes and cleanups [Florian; !223, !222, !225]

debian/changelog

@@ -1,16 +1,4 @@
-gnome-shell-extensions (42.3-1) unstable; urgency=medium
-
-  * New upstream release (LP: #1981606)
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 13 Jul 2022 17:49:05 +0200
-
-gnome-shell-extensions (42.2-1) unstable; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 03 Jun 2022 09:23:28 -0400
-
-gnome-shell-extensions (42.1-1) unstable; urgency=medium
+gnome-shell-extensions (42.1-0ubuntu1) jammy; urgency=medium
 
   * New upstream release (LP: #1972365)
 

debian/control

@@ -5,16 +5,19 @@
 Source: gnome-shell-extensions
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-gnome (>= 0.22),
                meson (>= 0.53.0),
                sassc
 Rules-Requires-Root: no
 Standards-Version: 4.6.0
-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions/tree/ubuntu/jammy
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git -b ubuntu/jammy
 Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
 
 Package: gnome-shell-extensions

debian/control.in

@@ -1,7 +1,8 @@
 Source: gnome-shell-extensions
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-gnome (>= 0.22),
@@ -9,8 +10,10 @@ Build-Depends: debhelper-compat (= 13),
                sassc
 Rules-Requires-Root: no
 Standards-Version: 4.6.0
-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions/tree/ubuntu/jammy
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git -b ubuntu/jammy
 Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
 
 Package: gnome-shell-extensions

debian/gbp.conf

@@ -1,6 +1,7 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/master
+debian-branch = ubuntu/jammy
+debian-tag = ubuntu/%(version)s
 upstream-branch = upstream/latest
 
 [buildpackage]

extensions/native-window-placement/extension.js

@@ -97,7 +97,7 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
         let rects = [];
         for (let i = 0; i < clones.length; i++) {
             // save rectangles into 4-dimensional arrays representing two corners of the rectangular: [left_x, top_y, right_x, bottom_y]
-            let rect = clones[i].boundingBox;
+            let rect = clones[i].metaWindow.get_frame_rect();
             rects[i] = new Rect(rect.x, rect.y, rect.width, rect.height);
             bounds = bounds.union(rects[i]);
 

extensions/screenshot-window-sizer/extension.js

@@ -101,6 +101,10 @@ function cycleScreenshotSizes(display, window, binding) {
     for (let i = 0; i < scaledSizes.length; i++) {
         let [width, height] = scaledSizes[i];
 
+        // ignore sizes bigger than the workArea
+        if (width > workArea.width || height > workArea.height)
+            continue;
+
         // get the best initial window size
         let error = Math.abs(width - outerRect.width) + Math.abs(height - outerRect.height);
         if (nearestIndex === undefined || error < nearestError) {
@@ -121,18 +125,8 @@ function cycleScreenshotSizes(display, window, binding) {
     if (newY + newHeight > workArea.y + workArea.height)
         newY = Math.max(workArea.y + workArea.height - newHeight);
 
-    const id = window.connect('size-changed', () => {
-        window.disconnect(id);
-        _notifySizeChange(window);
-    });
     window.move_resize_frame(true, newX, newY, newWidth, newHeight);
-}
 
-/**
- * @param {Meta.Window} window - the window whose size changed
- */
-function _notifySizeChange(window) {
-    const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage);
     let newOuterRect = window.get_frame_rect();
     let message = '%d×%d'.format(
         newOuterRect.width / scaleFactor,

extensions/window-list/extension.js

@@ -246,48 +246,6 @@ class BaseButton extends St.Button {
         this._updateVisibility();
     }
 
-    _setLongPressTimeout() {
-        if (this._longPressTimeoutId)
-            return;
-
-        const { longPressDuration } = Clutter.Settings.get_default();
-        this._longPressTimeoutId =
-            GLib.timeout_add(GLib.PRIORITY_DEFAULT, longPressDuration, () => {
-                delete this._longPressTimeoutId;
-
-                if (this._canOpenPopupMenu() && !this._contextMenu.isOpen)
-                    this._openMenu(this._contextMenu);
-                return GLib.SOURCE_REMOVE;
-            });
-    }
-
-    _removeLongPressTimeout() {
-        if (!this._longPressTimeoutId)
-            return;
-        GLib.source_remove(this._longPressTimeoutId);
-        delete this._longPressTimeoutId;
-    }
-
-    vfunc_button_press_event(buttonEvent) {
-        if (buttonEvent.button === 1)
-            this._setLongPressTimeout();
-        return super.vfunc_button_press_event(buttonEvent);
-    }
-
-    vfunc_button_release_event(buttonEvent) {
-        this._removeLongPressTimeout();
-
-        return super.vfunc_button_release_event(buttonEvent);
-    }
-
-    vfunc_touch_event(touchEvent) {
-        if (touchEvent.type === Clutter.EventType.TOUCH_BEGIN)
-            this._setLongPressTimeout();
-        else if (touchEvent.type === Clutter.EventType.TOUCH_END)
-            this._removeLongPressTimeout();
-        return super.vfunc_touch_event(touchEvent);
-    }
-
     activate() {
         if (this.active)
             return;
@@ -433,7 +391,7 @@ class WindowButton extends BaseButton {
             return;
         }
 
-        if (!button || button === 1)
+        if (button === 1)
             this._minimizeOrActivateWindow(this.metaWindow);
         else
             this._openMenu(this._contextMenu);
@@ -679,7 +637,7 @@ class AppButton extends BaseButton {
         if (contextMenuWasOpen)
             this._contextMenu.close();
 
-        if (!button || button === 1) {
+        if (button === 1) {
             if (menuWasOpen)
                 return;
 
@@ -832,7 +790,7 @@ class WindowList extends St.Widget {
         });
 
         this._overviewHidingId = Main.overview.connect('hidden', () => {
-            this.visible = !this._monitor.inFullscreen;
+            this.visible = !Main.layoutManager.primaryMonitor.inFullscreen;
             this._updateKeyboardAnchor();
         });
 

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '42.3',
+  version: '42.1',
   meson_version: '>= 0.53.0',
   license: 'GPL2+'
 )

po/zh_TW.po

@@ -9,39 +9,30 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions gnome-3-0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2022-05-06 11:44+0000\n"
-"PO-Revision-Date: 2022-05-12 00:01+0800\n"
+"POT-Creation-Date: 2020-08-12 23:03+0000\n"
+"PO-Revision-Date: 2020-09-22 23:06+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
 
 #: data/gnome-classic.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME Classic"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "這個作業階段讓您登入 GNOME Classic"
 
-#: data/gnome-classic-wayland.desktop.in:3
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME Classic 採行 Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME Classic 採行 Xorg"
-
-#: extensions/apps-menu/extension.js:118
+#: extensions/apps-menu/extension.js:113
 msgid "Favorites"
-msgstr "喜愛"
+msgstr "喜好"
 
-#: extensions/apps-menu/extension.js:379
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "應用程式"
 
@@ -57,26 +48,26 @@ msgstr ""
 "字串的列表，每個都包含一個應用程式 id (桌面檔名稱)，後面接著半形分號 \";\" 與"
 "工作區號碼"
 
-#: extensions/auto-move-windows/prefs.js:152
+#: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
 msgstr "工作區規則"
 
-#: extensions/auto-move-windows/prefs.js:306
+#: extensions/auto-move-windows/prefs.js:243
 msgid "Add Rule"
 msgstr "加入規則"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:126
-#: extensions/places-menu/placeDisplay.js:210
+#: extensions/drive-menu/extension.js:112
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "裝置「%s」退出失敗："
 
-#: extensions/drive-menu/extension.js:145
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "可移除式裝置"
 
-#: extensions/drive-menu/extension.js:167
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "開啟檔案"
 
@@ -106,31 +97,31 @@ msgstr ""
 "如果為真，在對映的縮圖頂端放置視窗說明標題，凌駕 Shell 將它放置在底部的預設"
 "值。變更這個設定值需要重新啟動 Shell 來套用效果。"
 
-#: extensions/places-menu/extension.js:94
-#: extensions/places-menu/extension.js:97
+#: extensions/places-menu/extension.js:89
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "位置"
 
-#: extensions/places-menu/placeDisplay.js:49
+#: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "無法啟動「%s」"
 
-#: extensions/places-menu/placeDisplay.js:64
+#: extensions/places-menu/placeDisplay.js:61
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "無法掛載儲存區「%s」"
 
-#: extensions/places-menu/placeDisplay.js:125
 #: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "電腦"
 
-#: extensions/places-menu/placeDisplay.js:336
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "家目錄"
 
-#: extensions/places-menu/placeDisplay.js:381
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "瀏覽網路"
 
@@ -150,47 +141,47 @@ msgstr "主題名稱"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "主題的名稱，要從 ~/.themes/name/gnome-shell 載入"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "關閉"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "取消最小化"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "最小化"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "最大化"
 
-#: extensions/window-list/extension.js:441
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
 msgstr "全部最小化"
 
-#: extensions/window-list/extension.js:447
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
 msgstr "全部取消最小化"
 
-#: extensions/window-list/extension.js:453
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
 msgstr "全部最大化"
 
-#: extensions/window-list/extension.js:461
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
 msgstr "全部取消最大化"
 
-#: extensions/window-list/extension.js:469
+#: extensions/window-list/extension.js:456
 msgid "Close all"
 msgstr "全部關閉"
 
-#: extensions/window-list/extension.js:753
+#: extensions/window-list/extension.js:734
 msgid "Window List"
 msgstr "視窗列表"
 
@@ -206,7 +197,7 @@ msgstr ""
 "決定在視窗列表中何時群組視窗。可能的數值有「never」、「auto」、「always」。"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:79
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "顯示所有工作區的視窗"
 
@@ -224,41 +215,41 @@ msgid ""
 "primary one."
 msgstr "是否在所有連接的螢幕顯示視窗列表或是只出現在主要螢幕上。"
 
-#: extensions/window-list/prefs.js:35
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "視窗群組"
 
-#: extensions/window-list/prefs.js:40
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "永不群組視窗"
 
-#: extensions/window-list/prefs.js:41
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "當空間受限時群組視窗"
 
-#: extensions/window-list/prefs.js:42
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "永遠群組視窗"
 
-#: extensions/window-list/prefs.js:66
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "顯示於所有螢幕"
 
-#: extensions/window-list/workspaceIndicator.js:261
-#: extensions/workspace-indicator/extension.js:266
+#: extensions/window-list/workspaceIndicator.js:207
+#: extensions/workspace-indicator/extension.js:213
 msgid "Workspace Indicator"
 msgstr "工作區指示器"
 
-#: extensions/workspace-indicator/prefs.js:62
+#: extensions/workspace-indicator/prefs.js:34
+msgid "Workspace Names"
+msgstr "工作區名稱"
+
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "工作區 %d"
 
-#: extensions/workspace-indicator/prefs.js:129
-msgid "Workspace Names"
-msgstr "工作區名稱"
-
-#: extensions/workspace-indicator/prefs.js:255
+#: extensions/workspace-indicator/prefs.js:218
 msgid "Add Workspace"
 msgstr "新增工作區"