Merge lp:~aacid/unity-2d/greek_chars_lens_activate into lp:unity-2d

[Albert Astals Cid]

[lib] Convert the percent encoded string to a form UnityCore understands

[lib] Convert the percent encoded string to a form UnityCore understands

[Gerry Boland (gerboland)]

Ok, I've tested this with as many unusual characters as I could assemble, it looks to be fine. Approving, thank you!

review: Approve

[Gerry Boland (gerboland)]

Ok, I've tested this with as many unusual characters as I could assemble, it looks to be fine. Approving, thank you!

review: Approve

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity-2d failed due to conflicts:

text conflict in tests/manual-tests/dash.txt

[lp:~aacid/unity-2d/greek_chars_lens_activate]

1104. By Albert Astals Cid on 2012-05-29

Merge lp:unity-2d

[Albert Astals Cid (aacid)]

Merged with lp:unity-2d to solve conflict in tests/manual-tests/dash.txt

=== modified file 'libunity-2d-private/src/lens.cpp'
--- libunity-2d-private/src/lens.cpp	2012-03-29 12:27:21 +0000
+++ libunity-2d-private/src/lens.cpp	2012-05-29 07:31:19 +0000
@@ -175,7 +175,7 @@
 
 void Lens::activate(const QString& uri)
 {
-    m_unityLens->Activate(uri.toStdString());
+    m_unityLens->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData());
 }
 
 void Lens::onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&)
 
=== modified file 'tests/manual-tests/dash.txt'
--- tests/manual-tests/dash.txt	2012-05-24 11:22:11 +0000
+++ tests/manual-tests/dash.txt	2012-05-29 07:31:19 +0000
@@ -261,3 +261,18 @@
   #   * Verify dash can be maximized in the first monitor (that is not the primary anymore)
 
 -----
+
+# Test case objectives:
+  #  * Ensure files inside folders with greek names open correctly
+  # Pre-conditions
+  #   * Have a folder with greek characters like Παράδειγμα
+  #   * Have a file called THIS_IS_A_TEST_FOR_GREEK_CHARS inside that folder
+  #   * Open that file from nautilus so it will show up in the files dash
+  # Test steps
+  #   * Open Dash
+  #   * Go to the files dash
+  #   * Type THIS_IS_A_TEST_FOR_GREEK_CHARS
+  #   * Open the file from the dash
+  #   * Verify the file really opens
+
+-----