d7324bb · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Correctly handle image URI scheme in results

d7324bbMichal Hruby13 years ago

plugins/Unity/iconutils.cpp+1−1

compare with xenial

unifiedsplit

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

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

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

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

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

34 return giconString;

35 }

tests/plugins/Unity/resultstest.cpp+1

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

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

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

73 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";

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

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

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

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

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

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