Merge lp:~njpatel/unity/lens-ordering into lp:unity

[Neil J. Patel]

This makes sure that the apps lens is always first, and adds basic ordering to the lenses instead of them always coming in randomly. It means that we send of the lens_added signal a little later, but that shouldn't make a difference to consumers.

This is done in a way to preserve ABI/API of UnityCore and I've added FIXMEs for the couple of things that should be changed when we branch for P.

[Mirco Müller (macslow)]

Gee... still got get used to all that new C++ stuff, but approved.

review: Approve

=== modified file 'UnityCore/FilesystemLenses.cpp'
--- UnityCore/FilesystemLenses.cpp	2011-08-07 09:21:37 +0000
+++ UnityCore/FilesystemLenses.cpp	2011-09-07 21:29:31 +0000
@@ -279,7 +279,28 @@
   // done reading the directory
   children_waiting_to_load_--;
   if (!children_waiting_to_load_)
+  {
+    //FIXME: This should be it's own function, but we're trying not to break ABI
+    // right now.
+    //FIXME: We don't have a strict order, but alphabetical serves us wonderfully for
+    // Oneiric. When we have an order/policy, please replace this.
+    auto sort_cb = [] (Lens::Ptr a, Lens::Ptr b) -> bool
+      {
+        if (a->id == "applications.lens")
+          return true;
+        else if (b->id == "applications.lens")
+          return false;
+        else
+          return g_strcmp0(a->id().c_str(), b->id().c_str()) < 0; 
+      };
+    std::sort(lenses_.begin(),
+              lenses_.end(),
+              sort_cb);
+    for (Lens::Ptr& lens: lenses_)
+      owner_->lens_added.emit(lens);
+
     owner_->lenses_loaded.emit();
+  }
 }
 
 void FilesystemLenses::Impl::CreateLensFromKeyFileData(GFile* file,
@@ -307,7 +328,6 @@
                               data.visible,
                               data.shortcut.Str()));
       lenses_.push_back(lens);
-      owner_->lens_added.emit(lens);
 
       LOG_DEBUG(logger) << "Sucessfully loaded lens file " << path;
     }