d7324bb · unity8 · git.iko.soy

git.iko.soy/unity8

Correctly handle image URI scheme in results

commitd7324bb984c5feb06914173b3c956759fa0f7df4 authorMichal Hruby <michal.mhr@gmail.com> dateWed 25 Sep 2013, 11:50 (13 years ago) parentaa1e99e

2 files changed+2−1

compare with xenial

unifiedsplit

plugins/Unity/iconutils.cpp+1−1 tests/plugins/Unity/resultstest.cpp+1

plugins/Unity/iconutils.cpp+1−1

@@ -30,7 +30,7 @@ QString gIconToDeclarativeImageProviderString(QString const &giconString)

3030 if (giconString.isEmpty()) return giconString;

3131

3232 if (giconString.startsWith('/') || giconString.startsWith(QLatin1String("http")) ||

33− giconString.startsWith(QLatin1String("file:"))) {

33+ giconString.startsWith(QLatin1String("file:")) || giconString.startsWith(QLatin1String("image:"))) {

3434 return giconString;

3535 }

3636

tests/plugins/Unity/resultstest.cpp+1

@@ -71,6 +71,7 @@ void ResultsTest::testIconColumn_data()

7171 QTest::newRow("absolute path") << "/usr/share/icons/example.png" << "/usr/share/icons/example.png";

7272 QTest::newRow("file uri") << "file:///usr/share/icons/example.png" << "file:///usr/share/icons/example.png";

7373 QTest::newRow("http uri") << "http://images.ubuntu.com/example.jpg" << "http://images.ubuntu.com/example.jpg";

74+ QTest::newRow("image uri") << "image://thumbnail/with/arguments?passed_to=ImageProvider" << "image://thumbnail/with/arguments?passed_to=ImageProvider";

7475 QTest::newRow("themed icon") << "accessories-other" << "image://theme/accessories-other";

7576 QTest::newRow("fileicon") << ". GFileIcon http://example.org/resource.gif" << "http://example.org/resource.gif";

7677 QTest::newRow("themedicon") << ". GThemedIcon accessories-other accessories generic" << "image://theme/accessories-other,accessories,generic";