Merge lp:~mterry/unity/742695 into lp:unity

[Michael Terry]

See bug 742695 for details.

[Mikkel Kamstrup Erlandsen (kamstrup)]

I think your analysis in the bug report sounds correct and the code looks good; so approved!

review: Approve

=== modified file 'src/LauncherController.cpp'
--- src/LauncherController.cpp	2011-03-23 20:33:39 +0000
+++ src/LauncherController.cpp	2011-03-25 19:36:38 +0000
@@ -235,6 +235,18 @@
 LauncherController::RegisterIcon (LauncherIcon *icon)
 {
   _model->AddIcon (icon);
+
+  BamfLauncherIcon *bamf_icon = dynamic_cast<BamfLauncherIcon *> (icon);
+  if (bamf_icon)
+  {
+    LauncherEntryRemote *entry = NULL;
+    const char *path;
+    path = bamf_icon->DesktopFile ();
+    if (path)
+      entry = _remote_model->LookupByDesktopFile (path);
+    if (entry)
+      icon->InsertEntryRemote (entry);
+  }
 }
 
 /* static private */