locations: Quote URIs when opening a location

If the URI has spaces in it, you need quoting to pass it correctly to 'gio open'.
micheleg · Apr 26, 2018 · 12fa1cb · 12fa1cb
1 parent e102e5a
commit 12fa1cb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/locations.js b/locations.js
@@ -163,11 +163,11 @@ var Removables = new Lang.Class({
         volumeKeys.set_string('Desktop Entry', 'Name', volume.get_name());
         volumeKeys.set_string('Desktop Entry', 'Icon', this._getWorkingIconName(volume.get_icon()));
         volumeKeys.set_string('Desktop Entry', 'Type', 'Application');
-        volumeKeys.set_string('Desktop Entry', 'Exec', 'nautilus ' + uri);
+        volumeKeys.set_string('Desktop Entry', 'Exec', 'nautilus "' + uri + '"');
         volumeKeys.set_string('Desktop Entry', 'StartupNotify', 'true');
         volumeKeys.set_string('Desktop Entry', 'Actions', 'mount;');
         volumeKeys.set_string('Desktop Action mount', 'Name', __('Mount'));
-        volumeKeys.set_string('Desktop Action mount', 'Exec', 'gio mount ' + uri);
+        volumeKeys.set_string('Desktop Action mount', 'Exec', 'gio mount "' + uri + '"');
         let volumeAppInfo = Gio.DesktopAppInfo.new_from_keyfile(volumeKeys);
         let volumeApp = new Shell.App({appInfo: volumeAppInfo});
         this._volumeApps.push(volumeApp);
@@ -204,19 +204,19 @@ var Removables = new Lang.Class({
         mountKeys.set_string('Desktop Entry', 'Icon',
                              this._getWorkingIconName(volume.get_icon()));
         mountKeys.set_string('Desktop Entry', 'Type', 'Application');
-        mountKeys.set_string('Desktop Entry', 'Exec', 'gio open ' + uri);
+        mountKeys.set_string('Desktop Entry', 'Exec', 'gio open "' + uri + '"');
         mountKeys.set_string('Desktop Entry', 'StartupNotify', 'true');
         mountKeys.set_string('Desktop Entry', 'XdtdUri', escapedUri);
         mountKeys.set_string('Desktop Entry', 'Actions', 'unmount;');
         if (mount.can_eject()) {
             mountKeys.set_string('Desktop Action unmount', 'Name', __('Eject'));
             mountKeys.set_string('Desktop Action unmount', 'Exec',
-                                 'gio mount -e ' + uri);
+                                 'gio mount -e "' + uri + '"');
         } else {
             mountKeys.set_string('Desktop Entry', 'Actions', 'unmount;');
             mountKeys.set_string('Desktop Action unmount', 'Name', __('Unmount'));
             mountKeys.set_string('Desktop Action unmount', 'Exec',
-                                 'gio mount -u ' + uri);
+                                 'gio mount -u "' + uri + '"');
         }
         let mountAppInfo = Gio.DesktopAppInfo.new_from_keyfile(mountKeys);
         let mountApp = new Shell.App({appInfo: mountAppInfo});