Remove new APIs

This will allow the extension to work well with older versions of GNOME. This is the whole point to the legacy branch.

Author: DEM0NAssissan7

README.md

@@ -24,8 +24,9 @@ Desktop Icons: Neo - Version 1.4 LTS
 
 ## Requirements
 
-* GNOME Shell >= 3.34
-* Nautilus >= 3.34
+The versions referenced here are GUARANTEED to completely work with the extension.
+* GNOME Shell >= 3.32
+* Nautilus >= 3.32
 
 ## Setting permissions
 

askConfirmPopup.js

@@ -0,0 +1,50 @@
+/* DING: Desktop Icons New Generation for GNOME Shell
+ *
+ * Copyright (C) 2019 Sergio Costas (rastersoft@gmail.com)
+ * Based on code original (C) Carlos Soriano
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+const Gtk = imports.gi.Gtk;
+const Pango = imports.gi.Pango;
+const Gettext = imports.gettext.domain('desktopicons-neo');
+
+const _ = Gettext.gettext;
+
+var AskConfirmPopup = class {
+
+    constructor(text, secondaryText, parentWindow) {
+
+        this._window = new Gtk.MessageDialog({window_position: Gtk.WindowPosition.CENTER_ON_PARENT,
+                                              transient_for: parentWindow,
+                                              message_type: Gtk.MessageType.WARNING,
+                                              buttons: Gtk.ButtonsType.NONE,
+                                              text: text,
+                                              secondary_text: secondaryText});
+        this._window.add_button(_("Cancel"), Gtk.ResponseType.CANCEL);
+        let deleteButton = this._window.add_button(_("Delete"), Gtk.ResponseType.OK);
+        deleteButton.get_style_context().add_class("destructive-action");
+    }
+
+    run() {
+        this._window.show_all();
+        let retval = this._window.run();
+        this._window.hide();
+        if (retval == Gtk.ResponseType.OK) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+};

askRenamePopup.js

@@ -77,9 +77,8 @@ var AskRenamePopup = class {
     }
 
     _do_rename() {
-        DBusUtils.NautilusFileOperations2Proxy.RenameURIRemote(
-            this._fileItem.file.get_uri(), this._textArea.text,
-            DBusUtils.NautilusFileOperations2Proxy.platformData(),
+        DBusUtils.NautilusFileOperationsProxy.RenameFileRemote(this._fileItem.file.get_uri(),
+                                                               this._textArea.text,
             (result, error) => {
                 if (error)
                     throw new Error('Error renaming file: ' + error.message);

dbusUtils.js

@@ -17,7 +17,7 @@
 
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-var NautilusFileOperations2Proxy;
+var NautilusFileOperationsProxy;
 var FreeDesktopFileManagerProxy;
 var GnomeNautilusPreviewProxy;
 var SwitcherooControlProxyClass;
@@ -26,51 +26,37 @@ var discreteGpuAvailable;
 var GnomeArchiveManagerProxy;
 var GtkVfsMetadataProxy;
 
-const NautilusFileOperations2Interface = `<node>
-<interface name='org.gnome.Nautilus.FileOperations2'>
+const NautilusFileOperationsInterface = `<node>
+<interface name='org.gnome.Nautilus.FileOperations'>
     <method name='CopyURIs'>
-        <arg type='as' name='sources' direction='in'/>
-        <arg type='s' name='destination' direction='in'/>
-        <arg type='a{sv}' name='platform_data' direction='in'/>
+        <arg name='URIs' type='as' direction='in'/>
+        <arg name='Destination' type='s' direction='in'/>
     </method>
     <method name='MoveURIs'>
-        <arg type='as' name='sources' direction='in'/>
-        <arg type='s' name='destination' direction='in'/>
-        <arg type='a{sv}' name='platform_data' direction='in'/>
+        <arg name='URIs' type='as' direction='in'/>
+        <arg name='Destination' type='s' direction='in'/>
     </method>
     <method name='EmptyTrash'>
-        <arg type="b" name="ask_confirmation" direction='in'/>
-        <arg type='a{sv}' name='platform_data' direction='in'/>
     </method>
-    <method name='TrashURIs'>
-        <arg type='as' name='uris' direction='in'/>
-        <arg type='a{sv}' name='platform_data' direction='in'/>
-    </method>
-    <method name='DeleteURIs'>
-        <arg type='as' name='uris' direction='in'/>
-        <arg type='a{sv}' name='platform_data' direction='in'/>
+    <method name='TrashFiles'>
+        <arg name='URIs' type='as' direction='in'/>
     </method>
     <method name='CreateFolder'>
-        <arg type='s' name='parent_uri' direction='in'/>
-        <arg type='s' name='new_folder_name' direction='in'/>
-        <arg type='a{sv}' name='platform_data' direction='in'/>
+        <arg name='URI' type='s' direction='in'/>
     </method>
-    <method name='RenameURI'>
-        <arg type='s' name='uri' direction='in'/>
-        <arg type='s' name='new_name' direction='in'/>
-        <arg type='a{sv}' name='platform_data' direction='in'/>
+    <method name='RenameFile'>
+        <arg name='URI' type='s' direction='in'/>
+        <arg name='NewName' type='s' direction='in'/>
     </method>
     <method name='Undo'>
-        <arg type='a{sv}' name='platform_data' direction='in'/>
     </method>
     <method name='Redo'>
-        <arg type='a{sv}' name='platform_data' direction='in'/>
     </method>
     <property name="UndoStatus" type="i" access="read"/>
 </interface>
 </node>`;
 
-const NautilusFileOperations2ProxyInterface = Gio.DBusProxy.makeProxyWrapper(NautilusFileOperations2Interface);
+const NautilusFileOperationsProxyInterface = Gio.DBusProxy.makeProxyWrapper(NautilusFileOperationsInterface);
 
 const FreeDesktopFileManagerInterface = `<node>
 <interface name='org.freedesktop.FileManager1'>
@@ -254,58 +240,17 @@ const GtkVfsMetadataInterface = `<node>
 const GtkVfsMetadataProxyInterface = Gio.DBusProxy.makeProxyWrapper(GtkVfsMetadataInterface);
 
 function init() {
-    NautilusFileOperations2Proxy = new NautilusFileOperations2ProxyInterface(
+    NautilusFileOperationsProxy = new NautilusFileOperationsProxyInterface(
         Gio.DBus.session,
         'org.gnome.Nautilus',
-        '/org/gnome/Nautilus/FileOperations2',
+        '/org/gnome/Nautilus',
         (proxy, error) => {
             if (error) {
                 log('Error connecting to Nautilus');
             }
         }
     );
 
-  NautilusFileOperations2Proxy.platformData = params => {
-    const inShell = typeof global !== 'undefined';
-    const defaultParams = {
-      timestamp: inShell ? global.get_current_time() :
-        imports.gi.Gtk.get_current_event_time(),
-      parentWindow: inShell ? null :
-        imports.gi.Gtk.get_current_event().get_window(),
-      windowPosition: 'center',
-    };
-    const { parentWindow, timestamp, windowPosition } = {
-      ...defaultParams,
-      ...params,
-    };
-
-    let { parentHandle } = params ?? { parentHandle: ''};
-    if (!parentHandle && parentWindow) {
-      try {
-        imports.gi.versions.GdkX11 = '3.0';
-        const { GdkX11 } = imports.gi;
-        const topLevel = parentWindow.get_effective_toplevel();
-
-        if (topLevel.constructor.$gtype === GdkX11.X11Window.$gtype) {
-          const xid = GdkX11.X11Window.prototype.get_xid.call(topLevel);
-          parentHandle = `x11:${xid}`;
-        } /* else if (topLevel instanceof GdkWayland.Toplevel) {
-          FIXME: Need Gtk4 to use GdkWayland
-          const handle = GdkWayland.Toplevel.prototype.export_handle.call(topLevel);
-          parentHandle = `wayland:${handle}`;
-        } */
-      } catch (e) {
-        logError(e, 'Impossible to determine the parent window');
-      }
-    }
-
-    return {
-      'parent-handle': new GLib.Variant('s', parentHandle),
-      'timestamp': new GLib.Variant('u', timestamp),
-      'window-position': new GLib.Variant('s', windowPosition),
-    };
-  }
-
     FreeDesktopFileManagerProxy = new FreeDesktopFileManagerProxyInterface(
         Gio.DBus.session,
         'org.freedesktop.FileManager1',

desktopIconsUtil.js

@@ -116,7 +116,6 @@ function getExtraFolders() {
 
 function getMounts(volumeMonitor) {
     let show_volumes = Prefs.desktopSettings.get_boolean('show-volumes');
-    let show_network = Prefs.desktopSettings.get_boolean('show-network-volumes');
 
     try {
         var mounts = volumeMonitor.get_mounts();
@@ -130,9 +129,9 @@ function getMounts(volumeMonitor) {
     for (let mount of mounts) {
         try {
             let is_drive = (mount.get_drive() != null) || (mount.get_volume() != null);
-            let uri = mount.get_default_location().get_uri();
-            if (((is_drive && show_volumes) || (!is_drive && show_network)) && (!(uris.includes(uri)))) {
-                result.push([mount.get_default_location(), Enums.FileType.EXTERNAL_DRIVE, mount]);
+            let uri = mount.get_root().get_uri();
+            if ((is_drive && show_volumes) && (!(uris.includes(uri)))) {
+                result.push([mount.get_root(), Enums.FileType.EXTERNAL_DRIVE, mount]);
                 uris.push(uri);
             }
         } catch(e) {
@@ -206,9 +205,9 @@ function isExecutable(mimetype, file_name) {
                     message_type: Gtk.MessageType.QUESTION,
                     buttons: Gtk.ButtonsType.NONE
                 });
-                dialog.add_button(_("Execute in a terminal"),
+                dialog.add_button(_("Run in terminal"),
                                   Enums.WhatToDoWithExecutable.EXECUTE_IN_TERMINAL);
-                dialog.add_button(_("Show"),
+                dialog.add_button(_("Display Text"),
                                   Enums.WhatToDoWithExecutable.DISPLAY);
                 dialog.add_button(_("Cancel"),
                                   Gtk.ResponseType.CANCEL);