Merge lp:~osomon/unity-2d/dynamic-places-fixes into lp:unity-2d/3.0

[Olivier Tilloy]

[launcher] Pick up newly installed lenses and display them.

Note to the reviewer: this has been tested with the AskUbuntu lens, available in the askubuntu-tools PPA (see instructions at http://www.omgubuntu.co.uk/2011/03/unity-askubuntu-lens-installable-via-ppa/).

Testing with other lenses is welcome (it may uncover other issues…).

[Florian Boucault (fboucault)]

Nicely spotted!

review: Approve

=== modified file 'launcher/UnityApplications/place.cpp'
--- launcher/UnityApplications/place.cpp	2011-04-01 12:07:53 +0000
+++ launcher/UnityApplications/place.cpp	2011-04-07 10:04:23 +0000
@@ -114,7 +114,10 @@
             connect(entry, SIGNAL(positionChanged(uint)),
                     SLOT(onEntryPositionChanged(uint)));
             m_static_entries[entry->dbusObjectPath()] = entry;
+            int index = m_entries.size();
+            beginInsertRows(QModelIndex(), index, index);
             m_entries.append(entry);
+            endInsertRows();
         }
 
         /* Monitor the corresponding D-Bus place service */

=== modified file 'launcher/UnityApplications/placeentry.cpp'
--- launcher/UnityApplications/placeentry.cpp	2011-03-23 08:32:51 +0000
+++ launcher/UnityApplications/placeentry.cpp	2011-04-07 10:04:23 +0000
@@ -925,10 +925,12 @@
 void
 PlaceEntry::updateInfo(const PlaceEntryInfoStruct& info)
 {
-    if (info.name != "") {
+    if (!info.name.isEmpty()) {
         setName(info.name);
     }
-    setIcon(info.icon);
+    if (!info.icon.isEmpty()) {
+        setIcon(info.icon);
+    }
     setPosition(info.position);
     setMimetypes(info.mimetypes);
     setSensitive(info.sensitive);