Actions: Escape path spaces when they are unquoted

This deprecates the EscapeSpaces field.

Escape spaces in paths when the Quote field is not set to either single
or double. Since spaces are now escaped when required, the EscapeSpaces
field is obsolete, and is hence deprecated. The field now does nothing.

See #3059.

Author: veractor

files/usr/share/nemo/actions/sample.nemo_action

@@ -96,14 +96,14 @@ Extensions=any;
 
 #Conditions=desktop;
 
-# Escape Spaces - set to true to escape spaces in filenames and uris ($U, $F, $P, $D)
+# Escape Spaces (deprecated)
 #
-# Sometimes this may be preferred to getting raw filenames that must be enclosed in
-# quotes.
+# This field is deprecated and does nothing - paths with spaces, as well as other special
+# shell characters, will now be passed on correctly no matter what, even when Quote is not set.
 #
 # Optional - by default this is false
 
-EscapeSpaces=true
+#EscapeSpaces=true
 
 # Run in terminal - set to true to execute the Exec line in a spawned terminal window.
 #

libnemo-private/nemo-action.c

@@ -1213,31 +1213,23 @@ find_token_type (const gchar *str, TokenType *token_type)
 static gchar *
 get_path (NemoAction *action, NemoFile *file)
 {
-    gchar *ret, *escaped, *orig;
+    gchar *ret, *orig;
 
     orig = nemo_file_get_path (file);
 
     if (action->quote_type == QUOTE_TYPE_DOUBLE) {
-        escaped = eel_str_escape_double_quoted_content (orig);
+        ret = eel_str_escape_double_quoted_content (orig);
     } else if (action->quote_type == QUOTE_TYPE_SINGLE) {
         // Replace literal ' with a close ', a \', and an open '
-        escaped = eel_str_replace_substring (orig, "'", "'\\''");
+        ret = eel_str_replace_substring (orig, "'", "'\\''");
     } else {
         escaped = eel_str_escape_non_space_special_characters (orig);
-    }
-
-    if (action->escape_space) {
         ret = eel_str_escape_spaces (escaped);
-    } else {
-        ret = escaped;
+        g_free (escaped);
     }
 
     g_free (orig);
 
-    if (ret != escaped) {
-        g_free (escaped);
-    }
-
     return ret;
 }
 
@@ -1300,23 +1292,18 @@ get_device_path (NemoAction *action, NemoFile *file)
     id = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
 
     if (action->quote_type == QUOTE_TYPE_DOUBLE) {
-        escaped = eel_str_escape_double_quoted_content (id);
+        ret = eel_str_escape_double_quoted_content (id);
     } else if (action->quote_type == QUOTE_TYPE_SINGLE) {
         // Replace literal ' with a close ', a \', and an open '
-        escaped = eel_str_replace_substring (id, "'", "'\\''");
+        ret = eel_str_replace_substring (id, "'", "'\\''");
     } else {
         escaped = eel_str_escape_non_space_special_characters (id);
-    }
-
-    g_free (id);
-
-    if (action->escape_space) {
         ret = eel_str_escape_spaces (escaped);
         g_free (escaped);
-    } else {
-        ret = escaped;
     }
 
+    g_free (id);
+
     g_object_unref (mount);
     g_object_unref (volume);