Merge lp:~fboucault/ubuntu-ui-toolkit/gicon_no_qpixmap into lp:ubuntu-ui-toolkit

[Florian Boucault]

GIconProvider: avoid using QPixmap which is not re-entrant. Fixes crashes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:596
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/291/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/881
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/885
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/885/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/759

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/291/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/giconprovider.cpp'
--- modules/Ubuntu/Components/plugin/giconprovider.cpp	2012-11-28 13:21:48 +0000
+++ modules/Ubuntu/Components/plugin/giconprovider.cpp	2013-07-09 14:26:22 +0000
@@ -59,7 +59,7 @@
 
 QImage GIconProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
 {
-    QPixmap result;
+    QImage result;
     QByteArray utf8Name = QUrl::fromPercentEncoding(id.toUtf8()).toUtf8();
     GError *error = NULL;
     GIcon *icon = g_icon_new_for_string(utf8Name.data(), &error);
@@ -73,9 +73,9 @@
         QIcon themedIcon = getThemedIcon(reinterpret_cast<GThemedIcon*>(icon));
         if (!themedIcon.isNull()) {
             if (requestedSize.isValid()) {
-                result = themedIcon.pixmap(requestedSize);
+                result = themedIcon.pixmap(requestedSize).toImage();
             } else {
-                result = themedIcon.pixmap(themedIcon.availableSizes().last());
+                result = themedIcon.pixmap(themedIcon.availableSizes().last()).toImage();
             }
         } else {
             qDebug() << "Fail to load themed icon for:" << id;
@@ -83,7 +83,7 @@
     } else if (G_IS_FILE_ICON(icon)) {
         gchar *iconName = g_icon_to_string(icon);
         if (QFile::exists(iconName)) {
-            result = QPixmap(iconName);
+            result.load(iconName);
             if (requestedSize.isValid()) {
                 result = result.scaled(requestedSize);
             }
@@ -98,5 +98,5 @@
 
     g_object_unref(icon);
     *size = result.size();
-    return result.toImage();
+    return result;
 }