import gnome-shell-extensions-3.32.1-14.el8

SOURCES/0001-Update-desktop-icons-gettext-domain.patch

+From f5e47cd8ca32ae433f6906b01a509c5a304894d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Sat, 24 Oct 2020 01:14:44 +0200
+Subject: [PATCH] Update desktop-icons gettext domain
+
+---
+ extensions/desktop-icons/createFolderDialog.js | 2 +-
+ extensions/desktop-icons/desktopGrid.js        | 2 +-
+ extensions/desktop-icons/fileItem.js           | 2 +-
+ extensions/desktop-icons/prefs.js              | 8 +++++---
+ 4 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/extensions/desktop-icons/createFolderDialog.js b/extensions/desktop-icons/createFolderDialog.js
+index f3e40e9..5038762 100644
+--- a/extensions/desktop-icons/createFolderDialog.js
++++ b/extensions/desktop-icons/createFolderDialog.js
+@@ -21,7 +21,7 @@ const { Clutter, GObject, GLib, Gio, St } = imports.gi;
+ const Signals = imports.signals;
+ 
+ const Dialog = imports.ui.dialog;
+-const Gettext = imports.gettext.domain('desktop-icons');
++const Gettext = imports.gettext.domain('gnome-shell-extensions');
+ const ModalDialog = imports.ui.modalDialog;
+ const ShellEntry = imports.ui.shellEntry;
+ const Tweener = imports.ui.tweener;
+diff --git a/extensions/desktop-icons/desktopGrid.js b/extensions/desktop-icons/desktopGrid.js
+index a2d1f12..94d2dfd 100644
+--- a/extensions/desktop-icons/desktopGrid.js
++++ b/extensions/desktop-icons/desktopGrid.js
+@@ -44,7 +44,7 @@ const Util = imports.misc.util;
+ 
+ const Clipboard = St.Clipboard.get_default();
+ const CLIPBOARD_TYPE = St.ClipboardType.CLIPBOARD;
+-const Gettext = imports.gettext.domain('desktop-icons');
++const Gettext = imports.gettext.domain('gnome-shell-extensions');
+ 
+ const _ = Gettext.gettext;
+ 
+diff --git a/extensions/desktop-icons/fileItem.js b/extensions/desktop-icons/fileItem.js
+index 0c6a54d..d6d43c9 100644
+--- a/extensions/desktop-icons/fileItem.js
++++ b/extensions/desktop-icons/fileItem.js
+@@ -42,7 +42,7 @@ const Prefs = Me.imports.prefs;
+ const DBusUtils = Me.imports.dbusUtils;
+ const DesktopIconsUtil = Me.imports.desktopIconsUtil;
+ 
+-const Gettext = imports.gettext.domain('desktop-icons');
++const Gettext = imports.gettext.domain('gnome-shell-extensions');
+ 
+ const _ = Gettext.gettext;
+ 
+diff --git a/extensions/desktop-icons/prefs.js b/extensions/desktop-icons/prefs.js
+index 4b8d986..51daf15 100644
+--- a/extensions/desktop-icons/prefs.js
++++ b/extensions/desktop-icons/prefs.js
+@@ -26,7 +26,7 @@ const Gettext = imports.gettext;
+ 
+ const Config = imports.misc.config;
+ 
+-var _ = Gettext.domain('desktop-icons').gettext;
++var _ = Gettext.domain('gnome-shell-extensions').gettext;
+ 
+ const SCHEMA_NAUTILUS = 'org.gnome.nautilus.preferences';
+ const SCHEMA_GTK = 'org.gtk.Settings.FileChooser';
+@@ -51,11 +51,13 @@ var CLICK_POLICY_SINGLE = false;
+ function initTranslations() {
+     let extension = ExtensionUtils.getCurrentExtension();
+ 
++    let domain = extension.metadata['gettext-domain'] || 'desktop-icons';
++
+     let localedir = extension.dir.get_child('locale');
+     if (localedir.query_exists(null))
+-        Gettext.bindtextdomain('desktop-icons', localedir.get_path());
++        Gettext.bindtextdomain(domain, localedir.get_path());
+     else
+-        Gettext.bindtextdomain('desktop-icons', Config.LOCALEDIR);
++        Gettext.bindtextdomain(domain, Config.LOCALEDIR);
+ }
+ 
+ function init() {
+-- 
+2.21.1
+

SOURCES/0001-desktop-icons-Update-Japanese-translation.patch

+From 0a7248c75c084a83852aa3d0e7a36ccebd365b81 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 27 Jan 2021 11:51:28 +0100
+Subject: [PATCH] desktop-icons: Update Japanese translation
+
+---
+ po/ja.po | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/po/ja.po b/po/ja.po
+index df5646d..4d780b9 100644
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -293,13 +293,8 @@ msgid "Workspace %d"
+ msgstr "ワークスペース %d"
+ 
+ #: desktopGrid.js:334
+-#, fuzzy
+ msgid "Display Settings"
+-msgstr ""
+-"#-#-#-#-#  ja.po (gnome-shell-extensions master)  #-#-#-#-#\n"
+-"ディスプレイ設定\n"
+-"#-#-#-#-#  ja.po (desktop-icons master)  #-#-#-#-#\n"
+-"ディスプレイの設定"
++msgstr "ディスプレイ設定"
+ 
+ #: schemas/org.gnome.shell.extensions.desktop-icons.gschema.xml:11
+ #, fuzzy
+-- 
+2.29.2
+

SOURCES/0001-fileItem-Ignore-double-click-distance-clicking-on-it.patch

+From f78b19068654412ca9e73a229e1537d080759c47 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Wed, 27 Jan 2021 16:55:10 +0100
+Subject: [PATCH] fileItem: Ignore double click distance clicking on items
+
+Imitate the behavior of Nautilus canvas WRT double clicks being
+handled on all of the icon(s) without accounting for the double
+click distance. As the extension does already lean on Nautilus
+look & feel, it seems to make sense doing this.
+
+This is not as crucial for mice as it is for touchscreens, where
+the default 5px limit may be a bit on the short side depending
+on device sensitivity.
+---
+ extensions/desktop-icons/fileItem.js | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/desktop-icons/fileItem.js b/extensions/desktop-icons/fileItem.js
+index d6d43c9..5d3195f 100644
+--- a/extensions/desktop-icons/fileItem.js
++++ b/extensions/desktop-icons/fileItem.js
+@@ -65,6 +65,9 @@ var FileItem = class {
+         this._setMetadataCancellable = null;
+         this._queryFileInfoCancellable = null;
+         this._isSpecial = this._fileExtra != Prefs.FileType.NONE;
++        this._lastClickTime = 0;
++        this._lastClickButton = 0;
++        this._clickCount = 0;
+ 
+         this._file = file;
+ 
+@@ -642,7 +645,24 @@ var FileItem = class {
+         DesktopIconsUtil.launchTerminal(this.file.get_path());
+     }
+ 
++    _updateClickState(event) {
++        let settings = Clutter.Settings.get_default();
++        if ((event.get_button() == this._lastClickButton) &&
++            ((event.get_time() - this._lastClickTime) < settings.double_click_time))
++            this._clickCount++;
++        else
++            this._clickCount = 1;
++
++        this._lastClickTime = event.get_time();
++        this._lastClickButton = event.get_button();
++    }
++
++    _getClickCount() {
++        return this._clickCount;
++    }
++
+     _onPressButton(actor, event) {
++        this._updateClickState(event);
+         let button = event.get_button();
+         if (button == 3) {
+             if (!this.isSelected)
+@@ -661,7 +681,7 @@ var FileItem = class {
+                 this._actionTrash.setSensitive(!specialFilesSelected);
+             return Clutter.EVENT_STOP;
+         } else if (button == 1) {
+-            if (event.get_click_count() == 1) {
++            if (this._getClickCount() == 1) {
+                 let [x, y] = event.get_coords();
+                 this._primaryButtonPressed = true;
+                 this._buttonPressInitialX = x;
+@@ -710,12 +730,12 @@ var FileItem = class {
+                 this._primaryButtonPressed = false;
+                 let shiftPressed = !!(event.get_state() & Clutter.ModifierType.SHIFT_MASK);
+                 let controlPressed = !!(event.get_state() & Clutter.ModifierType.CONTROL_MASK);
+-                if ((event.get_click_count() == 1) && Prefs.CLICK_POLICY_SINGLE && !shiftPressed && !controlPressed)
++                if ((this._getClickCount() == 1) && Prefs.CLICK_POLICY_SINGLE && !shiftPressed && !controlPressed)
+                     this.doOpen();
+                 this.emit('selected', shiftPressed || controlPressed, false, true);
+                 return Clutter.EVENT_STOP;
+             }
+-            if ((event.get_click_count() == 2) && (!Prefs.CLICK_POLICY_SINGLE))
++            if ((this._getClickCount() == 2) && (!Prefs.CLICK_POLICY_SINGLE))
+                 this.doOpen();
+         }
+         return Clutter.EVENT_PROPAGATE;
+-- 
+2.29.2
+

SPECS/gnome-shell-extensions.spec

@@ -6,7 +6,7 @@
 
 Name:           gnome-shell-extensions
 Version:        3.32.1
-Release:        11%{?dist}
+Release:        14%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 
 Group:          User Interface/Desktops
@@ -36,6 +36,9 @@ Patch0007:         more-classic-classic-mode.patch
 Patch0008:         0001-apps-menu-Add-missing-chain-up.patch
 Patch0009:         0001-dashToDock-Handle-no-overview-case.patch
 Patch0010:         0001-window-list-Invalid-current-mode-selected-in-Prefere.patch
+Patch0011:         0001-Update-desktop-icons-gettext-domain.patch
+Patch0012:         0001-desktop-icons-Update-Japanese-translation.patch
+Patch0013:         0001-fileItem-Ignore-double-click-distance-clicking-on-it.patch
 
 %description
 GNOME Shell Extensions is a collection of extensions providing additional and
@@ -469,6 +472,18 @@ cp $RPM_SOURCE_DIR/gnome-classic.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions
 
 
 %changelog
+* Wed Jan 27 2021 Carlos Garnacho <cgarnach@redhat.com> - 3.32.1-14
+- Use same logic than Nautilus for double click/tap in desktop-icons extension
+  Resolves: #1842229
+
+* Wed Jan 27 2021 Florian Müllner <fmuellner@redhat.com> - 3.32.1-13
+- Update Japanese translation
+  Related: #1865718
+
+* Sat Oct 24 2020 Florian Müllner <fmuellner@redhat.com> - 3.32.1-12
+- Adjust gettext locale in desktop-icons extension
+  Resolves: #1865718
+
 * Thu Apr 30 2020 Florian Müllner <fmuellner@redhat.com> - 3.32.1-11
 - Adjust dash-to-dock for classic backports
   Resolves: #1805929