Merge lp:~osomon/unity-2d/nautilus-changes-icon into lp:unity-2d/3.0

[Olivier Tilloy]

[launcher] Give priority to the contents of a favorite’s desktop file over the information provided by the running application.

Note to the reviewer: at this point in the schedule, it’s capital that the launcher is stress-tested to ensure that this change doesn’t introduce regressions. I’ve tested it thoroughly myself, but two pairs of eyes always do a better job than just one.

[Olivier Tilloy (osomon)]

Note: this branch also partly fixes bug #753382: the icon doesn’t change any more, but the information about synaptic running is still lost aftor closing the software properties window.
This issue likely has a separate root cause though, so it’s ok if this branch doesn’t fix it completely.

[Aurélien Gâteau (agateau)]

Works fine.

review: Approve

=== modified file 'launcher/UnityApplications/launcherapplication.cpp'
--- launcher/UnityApplications/launcherapplication.cpp	2011-04-07 09:16:50 +0000
+++ launcher/UnityApplications/launcherapplication.cpp	2011-04-12 14:14:28 +0000
@@ -170,6 +170,10 @@
 QString
 LauncherApplication::name() const
 {
+    if (sticky() && (m_appInfo != NULL)) {
+        return QString::fromUtf8(g_app_info_get_name(m_appInfo.data()));
+    }
+
     if (m_application != NULL) {
         return m_application->name();
     }
@@ -188,6 +192,11 @@
 QString
 LauncherApplication::icon() const
 {
+    if (sticky() && (m_appInfo != NULL)) {
+        GCharPointer ptr(g_icon_to_string(g_app_info_get_icon(m_appInfo.data())));
+        return QString::fromUtf8(ptr.data());
+    }
+
     if (m_application != NULL) {
         return m_application->icon();
     }
@@ -368,7 +377,9 @@
     }
 
     m_application = application;
-    setDesktopFile(application->desktop_file());
+    if (!sticky()) {
+        setDesktopFile(application->desktop_file());
+    }
 
     QObject::connect(application, SIGNAL(ActiveChanged(bool)), this, SIGNAL(activeChanged(bool)));