Merge lp:~fboucault/unity-2d/launcher_device_icons into lp:unity-2d/3.0

[Florian Boucault]

[launcher] Use appropriate icon for devices depending on their type (instead of always showing a USB icon).

[Aurélien Gâteau (agateau)]

Looks good, but code could be simplified by taking advantage of the GScopedPointer classes. Also you can return QString(), it is a tiny bit more efficient than QString("").

review: Needs Fixing

[Florian Boucault (fboucault)]

Suggestions have been applied.

[lp:~fboucault/unity-2d/launcher_device_icons]

551. By Florian Boucault on 2011-04-28

Simplified code using GScopedPointer.

[Aurélien Gâteau (agateau)]

Works well (finally found a device to check!)

review: Approve

=== modified file 'launcher/UnityApplications/launcherdevice.cpp'
--- launcher/UnityApplications/launcherdevice.cpp	2011-04-28 13:09:25 +0000
+++ launcher/UnityApplications/launcherdevice.cpp	2011-04-28 18:56:06 +0000
@@ -20,6 +20,7 @@
 #include "launcherdevice.h"
 #include "launchermenu.h"
 
+#include <gscopedpointer.h>
 #include "config.h"
 
 #include <QDebug>
@@ -93,7 +94,15 @@
 QString
 LauncherDevice::icon() const
 {
-    return QString(unity2dDirectory() + "/launcher/artwork/devices.png");
+    if (m_volume != NULL) {
+        GObjectPointer icon((GObject*)g_volume_get_icon(m_volume));
+        if (!icon.isNull()) {
+            GCharPointer iconName(g_icon_to_string((GIcon*)icon.data()));
+            return QString::fromUtf8(iconName.data());
+        }
+    }
+
+    return QString();
 }
 
 bool