From 33091f84eae593686cde998abf1d9912da8d8a90 Mon Sep 17 00:00:00 2001
From: fredcw <qbob751@gmail.com>
Date: Sat, 20 Jul 2024 12:58:43 +0100
Subject: [PATCH] Dns.js: Revert bug workaround

Revert a workaround added in commit https://github.com/linuxmint/cinnamon/pull/11688/commits/c5af58b2d4ccc4258494bf7127e8097a9fb92aef that prevented a dnd bug https://github.com/linuxmint/cinnamon/pull/11665#issuecomment-1557253018

The original bug https://github.com/linuxmint/cinnamon/issues/11123 has now been fixed so this workaround is no longer needed.
---
 js/ui/applet.js | 6 ------
 js/ui/dnd.js    | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/js/ui/applet.js b/js/ui/applet.js
index 113a9ca516..504f6899ad 100644
--- a/js/ui/applet.js
+++ b/js/ui/applet.js
@@ -17,7 +17,6 @@ const Signals = imports.signals;
 const Gettext = imports.gettext;
 const Cinnamon = imports.gi.Cinnamon;
 const SignalManager = imports.misc.signalManager;
-const Dnd = imports.ui.dnd;
 
 var AllowedLayout = {  // the panel layout that an applet is suitable for
     VERTICAL: 'vertical',
@@ -1059,11 +1058,6 @@ var PopupResizeHandler = class PopupResizeHandler {
             return false;
 
         //---Start drag------
-
-        if (Dnd.currentGrabActor != null) { //workaround for issue github.com/linuxmint/cinnamon/issues/11123
-            Dnd.currentGrabActor.fakeRelease();
-        }
-
         this._grabEvents(event);
         this.resizingInProgress = true;
 
diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 51aaade42c..35cd2c3fc6 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -46,8 +46,6 @@ var currentDraggable = null;
 var dragMonitors = [];
 var targetMonitors = [];
 
-var currentGrabActor = null; //This is used by class PopupResizeHandler in ui/applet.js as a workaround to issue github.com/linuxmint/cinnamon/issues/11123
-
 function _getEventHandlerActor() {
     if (!eventHandlerActor) {
         eventHandlerActor = new Clutter.Actor({ width: 0, height: 0 });
@@ -156,7 +154,6 @@ var _Draggable = new Lang.Class({
         this.drag_device.grab(this.actor);
         this._onEventId = this.actor.connect('event',
                                              Lang.bind(this, this._onEvent));
-        currentGrabActor = this;
     },
 
     _ungrabActor: function(event) {
@@ -171,7 +168,6 @@ var _Draggable = new Lang.Class({
 
         this.actor.disconnect(this._onEventId);
         this._onEventId = null;
-        currentGrabActor = null;
     },
 
     _grabEvents: function(event) {