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

[Florian Boucault]

[launcher] Support for distinct applications that have the same executable but different desktop files.

[Olivier Tilloy (osomon)]

Awesome, this also seems to fix bug #759776! (at least in the case of synaptic, I cannot reproduce the bug for empathy)

[Olivier Tilloy (osomon)]

It fixes the bugs linked, nice…

… BUT it introduces a regression: launching nautilus (either from the default favorite icon or from the dash) adds a new home folder icon to the launcher instead of marking the existing one active.

review: Needs Fixing

[Florian Boucault (fboucault)]

Good catch Olivier. We are hitting the same old bamf bug where sometimes nautilus is given as desktop file 'nautilus-home.desktop' and sometimes 'nautilus.desktop'. Unity hits the same bug if you first killall bamfdaemon.

[Florian Boucault (fboucault)]

Old bug is: https://bugs.launchpad.net/unity-2d/+bug/739454

[Florian Boucault (fboucault)]

$ Start Unity

Unity does not exhibit the bug.

$ killall bamfdaemon

Unity exhibits the bug.

$ unity --replace

Unity does not exhibit the bug anymore.

[Florian Boucault (fboucault)]

Bug finally registered against Unity: https://bugs.launchpad.net/unity/+bug/762898

[Florian Boucault (fboucault)]

An easy workaround for new Unity 2D users is to change the default favorite from nautilus-home.desktop to nautilus.desktop

[Florian Boucault (fboucault)]

Does the code look ok btw?

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

537. By Florian Boucault on 2011-04-16

Merged from trunk.

538. By Florian Boucault on 2011-04-18

Register favorites' desktop files.

[Olivier Tilloy (osomon)]

This works well, it fixes both bug #739454, bug #759776 and bug #760522, and despite stress-testing I wasn’t able to observe any regressions.

Note: it is critical that we don’t forget to push a new version of libqtbamf before pushing a new version of unity-2d.

review: Approve

=== modified file 'launcher/UnityApplications/launcherapplicationslist.cpp'
--- launcher/UnityApplications/launcherapplicationslist.cpp	2011-04-15 17:37:34 +0000
+++ launcher/UnityApplications/launcherapplicationslist.cpp	2011-04-18 10:19:39 +0000
@@ -232,6 +232,15 @@
     } else if (m_applicationForExecutable.contains(executable)) {
         /* A LauncherApplication with the same executable already exists */
         matchingApplication = m_applicationForExecutable[executable];
+        /* If the application already registered for that executable has a
+           desktop file assigned then make sure that the one to be inserted
+           has the same desktop file.
+        */
+        QString matchingDesktopFile = matchingApplication->desktop_file();
+        if (!matchingDesktopFile.isEmpty() && !desktop_file.isEmpty() &&
+            matchingDesktopFile != desktop_file) {
+                matchingApplication = NULL;
+        }
     }
 
     if (matchingApplication != NULL) {
@@ -265,6 +274,17 @@
                    << desktop_file << ")";
         delete application;
     } else {
+        /* Register favorite desktop file into BAMF: applications with the same
+           executable file will match with the given desktop file. This replicates
+           the behaviour of Unity that does it automatically when calling libbamf's
+           bamf_matcher_get_application_for_desktop_file.
+           It fixes bug https://bugs.launchpad.net/unity-2d/+bug/739454
+           The need for that API call is odd and causes at least one bug:
+           https://bugs.launchpad.net/unity/+bug/762898
+        */
+        BamfMatcher& matcher = BamfMatcher::get_default();
+        matcher.register_favorites(QStringList(application->desktop_file()));
+
         insertApplication(application);
         application->setSticky(true);
     }