Latest changes [ci skip]

FreeSlave · Sep 10, 2016 · 7aeacab · 7aeacab
1 parent e4d157f
commit 7aeacab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/source/desktopfile/file.d b/source/desktopfile/file.d
@@ -1123,7 +1123,7 @@ Type=Directory`;
      */
     @safe string[] expandExecValue(in string[] urls = null, string locale = null) const
     {   
-        return expandExecArgs(unquoteExec(execValue()), urls, locale);
+        return expandExecArgs(unquoteExec(execValue()), urls, localizedIconName(locale), localizedDisplayName(locale), fileName());
     }
 
     ///
@@ -1141,11 +1141,6 @@ Icon[ru]=folder_ru`;
         ["quoted program", "--icon", "folder_ru", "-w", "Программа", "-f", "/example.desktop", "one", "two", "one", "one", "one", "two"]);
     }
 
-    private @safe string[] expandExecArgs(in string[] execArgs, in string[] urls = null, string locale = null) const
-    {
-        return .expandExecArgs(execArgs, urls, localizedIconName(locale), localizedDisplayName(locale), fileName());
-    }
-
     /**
      * Starts the application associated with this .desktop file using urls as command line params.
      * 

diff --git a/source/desktopfile/utils.d b/source/desktopfile/utils.d
@@ -261,15 +261,15 @@ unittest
         return value[start..i].unescapeQuotedArgument();
     }
 
-    string append;
+    char[] append;
     bool wasInQuotes;
     while(i < value.length) {
         if (value[i] == ' ' || value[i] == '\t') {
             if (!wasInQuotes && append.length >= 1 && append[$-1] == '\\') {
-                append = append[0..$-1] ~ value[i];
+                append[$-1] = value[i];
             } else {
                 if (append !is null) {
-                    result ~= append;
+                    result ~= append.assumeUnique;
                     append = null;
                 }
             }
@@ -285,7 +285,7 @@ unittest
     }
 
     if (append !is null) {
-        result ~= append;
+        result ~= append.assumeUnique;
     }
 
     return result;