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

Proposed by Albert Astals Cid on 2012-05-23
Status: Merged
Approved by: Gerry Boland on 2012-05-29
Approved revision: 1104
Merged at revision: 1110
Proposed branch: lp:~aacid/unity-2d/greek_chars_lens_activate
Merge into: lp:unity-2d
Diff against target: 35 lines (+16/-1)
2 files modified
libunity-2d-private/src/lens.cpp (+1/-1)
tests/manual-tests/dash.txt (+15/-0)
To merge this branch: bzr merge lp:~aacid/unity-2d/greek_chars_lens_activate
Reviewer Review Type Date Requested Status
Gerry Boland 2012-05-23 Approve on 2012-05-28
Review via email: mp+107052@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

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) wrote :

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) wrote :

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

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

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

Merge lp:unity-2d

Albert Astals Cid (aacid) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libunity-2d-private/src/lens.cpp'
2--- libunity-2d-private/src/lens.cpp 2012-03-29 12:27:21 +0000
3+++ libunity-2d-private/src/lens.cpp 2012-05-29 07:31:19 +0000
4@@ -175,7 +175,7 @@
5
6 void Lens::activate(const QString& uri)
7 {
8- m_unityLens->Activate(uri.toStdString());
9+ m_unityLens->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData());
10 }
11
12 void Lens::onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&)
13
14=== modified file 'tests/manual-tests/dash.txt'
15--- tests/manual-tests/dash.txt 2012-05-24 11:22:11 +0000
16+++ tests/manual-tests/dash.txt 2012-05-29 07:31:19 +0000
17@@ -261,3 +261,18 @@
18 # * Verify dash can be maximized in the first monitor (that is not the primary anymore)
19
20 -----
21+
22+# Test case objectives:
23+ # * Ensure files inside folders with greek names open correctly
24+ # Pre-conditions
25+ # * Have a folder with greek characters like Παράδειγμα
26+ # * Have a file called THIS_IS_A_TEST_FOR_GREEK_CHARS inside that folder
27+ # * Open that file from nautilus so it will show up in the files dash
28+ # Test steps
29+ # * Open Dash
30+ # * Go to the files dash
31+ # * Type THIS_IS_A_TEST_FOR_GREEK_CHARS
32+ # * Open the file from the dash
33+ # * Verify the file really opens
34+
35+-----

Subscribers

People subscribed via source and target branches