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

[Florian Boucault]

[launcher] KDE3 applications now appear in the launcher.

That required to take into account the case where a BamfApplication's user_visible
went from false to true.

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

625. By Florian Boucault on 2011-07-14

Empty commit to link bugs fixed by that branch.

[Ugo Riboni (uriboni)]

Fixes the problem as advertised.
Code looks good too (use of UniqueConnection is clever)

review: Approve

=== modified file 'libunity-2d-private/Unity2d/launcherapplicationslist.cpp'
--- libunity-2d-private/Unity2d/launcherapplicationslist.cpp	2011-06-11 10:50:03 +0000
+++ libunity-2d-private/Unity2d/launcherapplicationslist.cpp	2011-07-14 11:26:29 +0000
@@ -227,8 +227,28 @@
     application->deleteLater();
 }
 
+void
+LauncherApplicationsList::onApplicationUserVisibleChanged(bool user_visible)
+{
+    BamfApplication* bamf_application = qobject_cast<BamfApplication*>(sender());
+    if (user_visible) {
+        insertBamfApplication(bamf_application);
+    } else {
+        /* FIXME: this case has not been implemented yet but it has not been
+           affecting anybody so far. */
+    }
+}
+
 void LauncherApplicationsList::insertBamfApplication(BamfApplication* bamf_application)
 {
+    /* Only insert BamfApplications for which the user_visible property is true.
+       Monitor that property so that they are inserted/removed dynamically when it changes.
+
+       Not doing it led to KDE3 applications not showing up in the launcher.
+       Ref.: https://bugs.launchpad.net/unity-2d/+bug/719983
+    */
+    QObject::connect(bamf_application, SIGNAL(UserVisibleChanged(bool)), this, SLOT(onApplicationUserVisibleChanged(bool)), Qt::UniqueConnection);
+
     if (!bamf_application->user_visible()) {
         return;
     }

=== modified file 'libunity-2d-private/Unity2d/launcherapplicationslist.h'
--- libunity-2d-private/Unity2d/launcherapplicationslist.h	2011-06-07 16:34:46 +0000
+++ libunity-2d-private/Unity2d/launcherapplicationslist.h	2011-07-14 11:26:29 +0000
@@ -102,6 +102,7 @@
     void onApplicationStickyChanged(bool sticky);
     void onApplicationLaunchingChanged(bool launching);
     void onApplicationUrgentChanged(bool urgent);
+    void onApplicationUserVisibleChanged(bool user_visible);
     void onRemoteEntryUpdated(QString applicationURI,
                               QMap<QString, QVariant> properties);
 };