Verified Commit eae3c4a0 authored by Iain Lane's avatar Iain Lane

Take proposed upstream patches to fix desktop-icons w/Shell 3.34

Bump dependency version accordingly
parent 5c05a51e
......@@ -21,7 +21,7 @@ Rules-Requires-Root: no
Package: gnome-shell-extension-desktop-icons
Architecture: all
Depends: ${misc:Depends},
gnome-shell (>= 3.30),
gnome-shell (>= 3.33),
gjs,
nautilus (>= 3.30.4),
xdg-desktop-portal
......
......@@ -17,7 +17,7 @@ Rules-Requires-Root: no
Package: gnome-shell-extension-desktop-icons
Architecture: all
Depends: ${misc:Depends},
gnome-shell (>= 3.30),
gnome-shell (>= 3.33),
gjs,
nautilus (>= 3.30.4),
xdg-desktop-portal
......
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
Date: Tue, 13 Aug 2019 15:11:20 +0200
Subject: createFolterDialog: Port to be a native GObject
Shell ModalDialog is now a native St.Widget, so inherit it as GObject.
Forwarded: https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/merge_requests/148
Origin: https://gitlab.gnome.org/3v1n0/desktop-icons/commit/f8833af8d383f03974a28bea8148b6480ba25ad8
---
createFolderDialog.js | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/createFolderDialog.js b/createFolderDialog.js
index f3e40e9..8d945ff 100644
--- a/createFolderDialog.js
+++ b/createFolderDialog.js
@@ -35,10 +35,12 @@ const _ = Gettext.gettext;
const DIALOG_GROW_TIME = 0.1;
-var CreateFolderDialog = class extends ModalDialog.ModalDialog {
-
- constructor() {
- super({ styleClass: 'create-folder-dialog' });
+var CreateFolderDialog = GObject.registerClass({
+ GTypeName: 'DesktopIcons_CreateFolderDialog',
+ Signals: { 'response': { param_types: [GObject.TYPE_STRING] } }
+}, class CreateFolderDialog extends ModalDialog.ModalDialog {
+ _init() {
+ super._init({ styleClass: 'create-folder-dialog' });
this._buildLayout();
}
@@ -160,5 +162,4 @@ var CreateFolderDialog = class extends ModalDialog.ModalDialog {
this._createButton.reactive = is_valid;
}
-};
-Signals.addSignalMethods(CreateFolderDialog.prototype);
+});
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
Date: Tue, 13 Aug 2019 15:12:26 +0200
Subject: general: Don't use actor property for native objects
Menu items and BoxPointers are now actors themselves, so don't use the actor
property anymore.
Forwarded: https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/merge_requests/148
Origin: https://gitlab.gnome.org/3v1n0/desktop-icons/commit/2f9c58aeffbeb292bdd09a61a956baaa33d5c1e8
---
desktopGrid.js | 8 ++++----
fileItem.js | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/desktopGrid.js b/desktopGrid.js
index a2d1f12..9d1b0f2 100644
--- a/desktopGrid.js
+++ b/desktopGrid.js
@@ -308,8 +308,8 @@ var DesktopGrid = class {
}
_syncUndoRedo() {
- this._undoMenuItem.actor.visible = DBusUtils.NautilusFileOperationsProxy.UndoStatus == UndoStatus.UNDO;
- this._redoMenuItem.actor.visible = DBusUtils.NautilusFileOperationsProxy.UndoStatus == UndoStatus.REDO;
+ this._undoMenuItem.visible = DBusUtils.NautilusFileOperationsProxy.UndoStatus == UndoStatus.UNDO;
+ this._redoMenuItem.visible = DBusUtils.NautilusFileOperationsProxy.UndoStatus == UndoStatus.REDO;
}
_undoStatusChanged(proxy, properties, test) {
@@ -508,7 +508,7 @@ var DesktopGrid = class {
_addDesktopBackgroundMenu() {
this.actor._desktopBackgroundMenu = this._createDesktopBackgroundMenu();
- this.actor._desktopBackgroundManager = new PopupMenu.PopupMenuManager({ actor: this.actor });
+ this.actor._desktopBackgroundManager = new PopupMenu.PopupMenuManager(this.actor);
this.actor._desktopBackgroundManager.addMenu(this.actor._desktopBackgroundMenu);
this.actor.connect('destroy', () => {
@@ -612,7 +612,7 @@ var RenamePopup = class {
renameContent.add_child(renameButtonsBox);
this._boxPointer = new BoxPointer.BoxPointer(St.Side.TOP, { can_focus: false, x_expand: false });
- this.actor = this._boxPointer.actor;
+ this.actor = this._boxPointer;
this.actor.style_class = 'popup-menu-boxpointer';
this.actor.add_style_class_name('popup-menu');
this.actor.visible = false;
diff --git a/fileItem.js b/fileItem.js
index 0c6a54d..96d4ab5 100644
--- a/fileItem.js
+++ b/fileItem.js
@@ -586,7 +586,7 @@ var FileItem = class {
_recreateMenu() {
this._removeMenu();
- this._menuManager = new PopupMenu.PopupMenuManager({ actor: this.actor });
+ this._menuManager = new PopupMenu.PopupMenuManager(this.actor);
let side = St.Side.LEFT;
if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
side = St.Side.RIGHT;
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
Date: Tue, 13 Aug 2019 15:12:44 +0200
Subject: metadata: Bump dependency on 3.34.0
Forwarded: https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/merge_requests/148
Origin: https://gitlab.gnome.org/3v1n0/desktop-icons/commit/edc201bbb92a325aeea56094c4a2a3501ce4f7ab
---
metadata.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/metadata.json b/metadata.json
index b8e8187..f9817d5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1 +1 @@
-{"name": "Desktop Icons", "description": "Add icons to the desktop", "uuid": "desktop-icons@csoriano", "shell-version": ["3.30.0"]}
+{"name": "Desktop Icons", "description": "Add icons to the desktop", "uuid": "desktop-icons@csoriano", "shell-version": ["3.34.0"]}
createFolterDialog-Port-to-be-a-native-GObject.patch
general-Don-t-use-actor-property-for-native-objects.patch
metadata-Bump-dependency-on-3.34.0.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment