Merge lp:~unity-team/unity/places-bar into lp:unity

[Neil J. Patel]

Wow, where to start?

- Basically re-architects the places for the new specs (as much as possible, balancing between delievering something for A2 and pushing somethings for next week)
- Removes all the old code
- Introduces a bunch of new models (with tests) and views (pending design before finalising tests) which all come together in a place-fuelled love-fest
- Wraps the place and place-entry dbus objects and reads-from and writes-to them
- Removes the expose in favour of always-places mode for the Ubuntu icon
- Adds some animations to switching to/from places, removes the effect that doesn't work
- Adds about_to_show_places API to the shell, for very lazy loading of places
- Fixes a bunch of warnings from other components too (only quicklist's warnings left now to fix)
- Some more general clean ups

Things to be handled in a separate merge-request:
- If there are no places, then show expose instead of blank places
- Handle the case of places not being found on the bus better (may crash right now)
- Clean up the dynamic loading of the renderers to make it, well, dynamic :)
- Same with the group renderers
- Lot's of fixes to the UI such as only showing the first row of group results initially, better icons, better text, animations etc

Code will change still a bit, so I guess testing of what's there with some place daemons would be better.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Hey, super nice work. Only nitpickings:

unity-private/panel/panel-home-button.vala:

 * "along with this program" -> "along with program" in the GNU header. A s/this// on the lose? :-)

unity-private/panel/panel-view.vala:

 * public void set_indicator_mode (bool mode) could be set_indicator_hidden(bool hidden) to make the code clearer

unity-private/places/places-place-model.vala:

 * private async void load_place_files() calls load_place() which does sync io. You'd need to async load data into a buffer (fx. GInputStream -> GMemoryOutputStream) and do g_key_file_load_from_data(). Either add FIXME or do it fully async.

unity-private/places/places-place-search-bar.vala:

 * Timeout.add (0, bg.update_background); - why not Idle.add() then? A code comment to clarify why we need it in the first place perhaps?

 * Define const int for 400?

 * Hard coded BG in PlaceSearchBarBackground. Should be something like Config.DATADIR + "/unity/dash_background.png"

 * Sync io when loading pixbuf. Nontrivial fix. Perhaps add a code comment or FIXME and consider it for later

Regressions? We seem to no longer have:

 * Trash, Home screen

File bugs for missing work items to ensure we don't forget some details?

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-06-03 17:13:55 +0000
+++ .bzrignore	2010-06-24 07:45:42 +0000
@@ -275,3 +275,42 @@
 tests/ui/test-home-button.c
 tests/unit/test-panel-indicator-object-entry-view.c
 po/unity.pot
+tests/unit/test-panel-indicator-object-view.c
+tests/unit/test-place.c
+tests/unit/test-places-place-file-model.c
+unity/unity-place.c
+unity-private/places/places-place-entry.c
+unity-private/places/places-place-model.c
+tests/unit/test-places-place.c
+unity.pc
+tests/ui/test-indicators.c
+places/application-place.c
+places/bar-model.c
+places/bar-view.c
+places/cairo-drawing.c
+places/default-model.c
+places/default-view.c
+places/file-place.c
+places/places-controller.c
+places/places-model.c
+places/places-place-bar.c
+places/places-place.c
+places/places-place-entry.c
+places/places-place-entry-view.c
+places/places-place-model.c
+places/places-place-proxy.c
+places/places-place-view.c
+places/places-results-view.c
+places/places-view.c
+places/search-field.c
+unity-private/panel/panel-indicator-background.c
+unity-private/places/places-place-bar.c
+unity-private/places/places-place-entry-view.c
+unity-private/places/places-place-search-bar.cunity-private/places/places-place-search-bar.c
+unity-private/places/places-place-search-bar.c
+unity/unity-cairo-canvas.c
+unity-private/places/places-place-search-entry.c
+unity-private/places/places-place-search-sections-bar.c
+unity/unity-place-renderer.c
+unity-private/places/places-default-renderer-group.c
+unity-private/places/places-default-renderer.c

=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-06-17 16:13:00 +0000
+++ targets/mutter/plugin.vala	2010-06-24 07:45:42 +0000
@@ -131,8 +131,6 @@
     private unowned Mutter.MetaWindow?  focus_window = null;
     private unowned Mutter.MetaDisplay? display = null;
 
-    private bool     places_enabled = false;
-
     private DragDest drag_dest;
     private bool     places_showing;
     private bool     _fullscreen_obstruction;
@@ -229,8 +227,6 @@
 
       Ctk.dnd_init ((Gtk.Widget)this.drag_dest, target_list);
 
-      this.places_enabled = envvar_is_enabled ("UNITY_ENABLE_PLACES");
-
       Clutter.Group window_group = (Clutter.Group) this.plugin.get_window_group ();
 
       this.background = new Background ();
@@ -256,19 +252,16 @@
       this.launcher.get_view ().animate (Clutter.AnimationMode.EASE_IN_SINE, 400,
                                   "opacity", 255);
 
-      if (this.places_enabled)
-        {
-          this.places_controller = new Places.Controller (this);
-          this.places = this.places_controller.get_view ();
+      this.places_controller = new Places.Controller (this);
+      this.places = this.places_controller.get_view ();
 
-          window_group.add_actor (this.places);
-          window_group.raise_child (this.places,
-                                    this.launcher.get_view ());
-          this.places.opacity = 0;
-          this.places.reactive = false;
-          this.places.hide ();
-          this.places_showing = false;
-        }
+      window_group.add_actor (this.places);
+      window_group.raise_child (this.places,
+                                this.launcher.get_view ());
+      this.places.opacity = 0;
+      this.places.reactive = false;
+      this.places.hide ();
+      this.places_showing = false;
 
       this.panel = new Panel.View (this);
       window_group.add_actor (this.panel);
@@ -293,20 +286,20 @@
       this.ensure_input_region ();
       return false;
     }
-    
+
     private void on_focus_window_changed ()
     {
       check_fullscreen_obstruction ();
-      
+
       if (focus_window != null)
         {
           focus_window.notify["fullscreen"].disconnect (on_focus_window_fullscreen_changed);
         }
-      
+
       display.get ("focus-window", ref focus_window);
       focus_window.notify["fullscreen"].connect (on_focus_window_fullscreen_changed);
     }
-    
+
     private void on_focus_window_fullscreen_changed ()
     {
       warning ("FOCUS WINDOW FULLSCREEN CHANGED");
@@ -336,26 +329,26 @@
     {
       Mutter.Window focus = null;
       bool fullscreen = false;
-      
+
       // prevent segfault when mutter beats us to the initialization punch
       if (!(launcher is Launcher.Launcher) || !(panel is Clutter.Actor))
         return;
-      
+
       unowned GLib.List<Mutter.Window> mutter_windows = plugin.get_windows ();
       foreach (Mutter.Window w in mutter_windows)
         {
           unowned Mutter.MetaWindow meta = w.get_meta_window ();
-          
+
           if (meta != null && Mutter.MetaWindow.has_focus (w.get_meta_window ()))
-            {  
+            {
               focus = w;
               break;
             }
         }
-      
+
       if (focus == null)
         return;
-      
+
       (focus.get_meta_window () as GLib.Object).get ("fullscreen", ref fullscreen);
       if (fullscreen)
         {
@@ -395,11 +388,8 @@
                        this.QUICKLAUNCHER_WIDTH - 1, 0, (uint32)height,
                        PANEL_HEIGHT, 0, (uint32)width);
 
-      if (this.places_enabled)
-        {
-          this.places.set_size (width, height);
-          this.places.set_position (0, 0);
-        }
+      this.places.set_size (width, height);
+      this.places.set_position (0, 0);
 
       this.panel.set_size (width, 24);
       this.panel.set_position (0, 0);
@@ -465,11 +455,10 @@
      * SHELL IMPLEMENTATION
      */
 
+    /*
     public void show_window_picker ()
     {
-      if (this.places_enabled == true)
-        {
-          this.show_unity ();
+      this.show_unity ();
           return;
         }
 
@@ -489,6 +478,7 @@
 
       this.expose_windows (windows, 80);
     }
+    */
 
     public Clutter.Stage get_stage ()
     {
@@ -500,7 +490,7 @@
       for (int i = 0; i < xids.length; i++)
         {
           uint32 xid = xids.index (i);
-          
+
           unowned GLib.List<Mutter.Window> mutter_windows = this.plugin.get_windows ();
           foreach (Mutter.Window window in mutter_windows)
             {
@@ -519,7 +509,7 @@
       for (int i = 0; i < xids.length; i++)
         {
           uint32 xid = xids.index (i);
-          
+
           unowned GLib.List<Mutter.Window> mutter_windows = plugin.get_windows ();
           foreach (Mutter.Window w in mutter_windows)
             {
@@ -531,7 +521,7 @@
                 }
             }
         }
-        
+
       expose_windows (windows);
     }
 
@@ -549,14 +539,14 @@
           ulong window_xid = (ulong) Mutter.MetaWindow.get_xwindow (mutter_window.get_meta_window ());
           if (window_xid != xid)
             continue;
-          
+
           int type = mutter_window.get_window_type ();
 
           if (type != Mutter.MetaWindowType.NORMAL &&
               type != Mutter.MetaWindowType.DIALOG &&
               type != Mutter.MetaWindowType.MODAL_DIALOG)
             continue;
-          
+
           uint32 time_;
           unowned Mutter.MetaWindow meta = mutter_window.get_meta_window ();
 
@@ -590,23 +580,24 @@
 
     public void show_unity ()
     {
-      if (this.places_enabled == false)
-        {
-          show_window_picker ();
-          return;
-        }
       if (this.places_showing)
         {
           this.places_showing = false;
 
-          this.places.hide ();
-          this.places.opacity = 0;
-          this.places.reactive = false;
-
-          this.actor_blur.destroy ();
-          this.dark_box.destroy ();
+          var anim = dark_box.animate (Clutter.AnimationMode.EASE_IN_QUAD, 100, "opacity", 0);
+          anim.completed.connect ((an) => {
+            (an.get_object () as Clutter.Actor).destroy ();
+          });
+
+          plugin.get_normal_window_group ().animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100, "opacity", 255);
+
+          anim = places.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100,
+                          "opacity", 0);
+          anim.completed.connect ((an) => {
+            (an.get_object () as Clutter.Actor).hide ();
+            });
+
           this.panel.set_indicator_mode (false);
-
           this.ensure_input_region ();
         }
       else
@@ -614,26 +605,17 @@
           this.places_showing = true;
 
           this.places.show ();
-          this.places.opacity = 255;
-          this.places.reactive = true;
-
-          this.actor_blur = new ActorBlur (this.plugin.get_normal_window_group ());
-
-          (this.plugin.get_window_group () as Clutter.Container).add_actor (this.actor_blur);
-          (this.actor_blur as Clutter.Actor).raise (this.plugin.get_normal_window_group ());
-
-          this.actor_blur.set_position (0, 0);
-
+          this.places.opacity = 0;
           this.dark_box = new Clutter.Rectangle.with_color ({0, 0, 0, 255});
 
           (this.plugin.get_window_group () as Clutter.Container).add_actor (this.dark_box);
-          this.dark_box.raise (this.actor_blur);
+          this.dark_box.raise (plugin.get_normal_window_group ());
 
           this.dark_box.set_position (0, 0);
           this.dark_box.set_size (this.stage.width, this.stage.height);
 
           this.dark_box.show ();
-          this.actor_blur.show ();
+
           this.panel.set_indicator_mode (true);
 
           this.ensure_input_region ();
@@ -641,12 +623,19 @@
           new X.Display (null).flush ();
 
           this.dark_box.opacity = 0;
-          this.actor_blur.opacity = 255;
 
-          this.dark_box.animate   (Clutter.AnimationMode.EASE_IN_SINE, 250, "opacity", 180);
+          this.dark_box.animate   (Clutter.AnimationMode.EASE_IN_QUAD, 100, "opacity", 180);
+          plugin.get_normal_window_group ().animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100, "opacity", 0);
+          places.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100,
+                          "opacity", 255);
         }
     }
 
+    public void about_to_show_places ()
+    {
+      places.about_to_show ();
+    }
+
     public void grab_keyboard (bool grab, uint32 timestamp)
     {
       if (this.grab_enabled == grab)
@@ -703,7 +692,7 @@
     {
       this.maximus.process_window (window);
       this.window_mapped (this, window);
-      
+
       if (display == null)
         {
           display = Mutter.MetaWindow.get_display (window.get_meta_window ());

=== modified file 'tests/ui/test-home-button.vala'
--- tests/ui/test-home-button.vala	2010-06-03 13:14:06 +0000
+++ tests/ui/test-home-button.vala	2010-06-24 07:45:42 +0000
@@ -132,7 +132,7 @@
     }
 
     public void
-    show_window_picker ()
+    about_to_show_places ()
     {
       // stub
     }

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2010-06-10 00:17:10 +0000
+++ tests/unit/Makefile.am	2010-06-24 07:45:42 +0000
@@ -39,6 +39,7 @@
   --pkg indicator \
   --pkg clutk-0.3 \
   --pkg launcher-0.3 \
+  --pkg posix \
   --pkg test-const \
   --pkg unique-1.0 \
   --pkg unity \
@@ -50,6 +51,8 @@
   test-launcher.vala \
   test-panel-indicator-object-entry-view.vala \
   test-panel-indicator-object-view.vala \
+  test-places-place-file-model.vala \
+  test-places-place.vala \
   test-places.vala \
   test-place.vala \
   test-unit.vala

=== modified file 'tests/unit/data/Makefile.am'
--- tests/unit/data/Makefile.am	2010-06-10 11:28:37 +0000
+++ tests/unit/data/Makefile.am	2010-06-24 07:45:42 +0000
@@ -1,1 +1,6 @@
-EXTRA_DIST = test_desktop_file.desktop
+EXTRA_DIST = \
+  place0.badplace \
+  place0.place \
+  place1.badplace \
+  place1.place \
+  test_desktop_file.desktop

=== added file 'tests/unit/data/place0.badplace'
--- tests/unit/data/place0.badplace	1970-01-01 00:00:00 +0000
+++ tests/unit/data/place0.badplace	2010-06-24 07:45:42 +0000
@@ -0,0 +1,3 @@
+[PlaceGroup]
+DBusName=org.ayatana.Unity.Place0
+DBusObjectPath=/org/ayatana/Unity/Place0

=== added file 'tests/unit/data/place0.place'
--- tests/unit/data/place0.place	1970-01-01 00:00:00 +0000
+++ tests/unit/data/place0.place	2010-06-24 07:45:42 +0000
@@ -0,0 +1,3 @@
+[Place]
+DBusName=org.ayatana.Unity.Place0
+DBusObjectPath=/org/ayatana/Unity/Place0

=== added file 'tests/unit/data/place1.badplace'
--- tests/unit/data/place1.badplace	1970-01-01 00:00:00 +0000
+++ tests/unit/data/place1.badplace	2010-06-24 07:45:42 +0000
@@ -0,0 +1,19 @@
+[Place]
+DBusName=org.ayatana.Unity.Place1
+DBusObjectPath=/org/ayatana/Unity/Place1
+
+[Entry:One]
+DBusObjectPath=org/ayatana/Unity/Place1/Entry1
+Icon=gtk-apply
+Name=One
+Description=One Description
+ShowGlobal=true
+ShowEntry=false
+
+[Entry:Two]
+DBusObjectPath=
+Icon=gtk-close
+Name=Two
+Description=Two Description
+ShowGlobal=false
+ShowEntry=true

=== added file 'tests/unit/data/place1.place'
--- tests/unit/data/place1.place	1970-01-01 00:00:00 +0000
+++ tests/unit/data/place1.place	2010-06-24 07:45:42 +0000
@@ -0,0 +1,27 @@
+[Place]
+DBusName=org.ayatana.Unity.Place1
+DBusObjectPath=/org/ayatana/Unity/Place1
+
+[Entry:One]
+DBusObjectPath=/org/ayatana/Unity/Place1/Entry1
+Icon=gtk-apply
+Name=One
+Description=One Description
+ShowGlobal=true
+ShowEntry=false
+
+[Entry:Two]
+DBusObjectPath=/org/ayatana/Unity/Place1/Entry2
+Icon=gtk-close
+Name=Two
+Description=Two Description
+ShowGlobal=false
+ShowEntry=true
+
+[Entry:Three]
+DBusObjectPath=/org/ayatana/Unity/Place1/Entry3
+Icon=gtk-cancel
+Name=Three
+Description=Three Description
+ShowGlobal=false
+ShowEntry=false

=== added file 'tests/unit/test-places-place-file-model.vala'
--- tests/unit/test-places-place-file-model.vala	1970-01-01 00:00:00 +0000
+++ tests/unit/test-places-place-file-model.vala	2010-06-24 07:45:42 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+using Unity;
+using Unity.Testing;
+using Unity.Places;
+
+namespace Unity.Tests.Unit
+{
+  public class PlacesPlaceFileModelSuite : Object
+  {
+    public const string DOMAIN = "/Unit/Places/PlaceFileModel";
+
+    public PlacesPlaceFileModelSuite ()
+    {
+      Logging.init_fatal_handler ();
+
+      Test.add_data_func (DOMAIN + "/Allocation", test_allocation);
+    }
+
+    private void test_allocation ()
+    {
+      var model = new PlaceFileModel.with_directory (TESTDIR+"/data");
+      assert (model is PlaceFileModel);
+      assert (model.size == 2);
+    }
+  }
+}

=== added file 'tests/unit/test-places-place.vala'
--- tests/unit/test-places-place.vala	1970-01-01 00:00:00 +0000
+++ tests/unit/test-places-place.vala	2010-06-24 07:45:42 +0000
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+using Unity;
+using Unity.Testing;
+using Unity.Places;
+using GLib.Test;
+
+namespace Unity.Tests.Unit
+{
+  public class PlacesPlaceSuite : Object
+  {
+    public const string DOMAIN = "/Unit/Places/Place";
+
+    public PlacesPlaceSuite ()
+    {
+      Logging.init_fatal_handler ();
+
+      Test.add_data_func (DOMAIN + "/Allocation", test_allocation);
+      Test.add_data_func (DOMAIN + "/SimplePlaceFile", test_simple_placefile);
+      Test.add_data_func (DOMAIN + "/AdvancedPlaceFile", test_advanced_place_file);
+      Test.add_data_func (DOMAIN + "/BadSimplePlaceFile", test_bad_simple_place_file);
+      Test.add_data_func (DOMAIN + "/BadAdvancedPlaceFile", test_bad_advanced_place_file);
+    }
+
+    private void test_allocation ()
+    {
+      var place = new Places.Place ("__name__", "__path__");
+      assert (place is Places.Place);
+      assert (place.dbus_name == "__name__");
+      assert (place.dbus_path == "__path__");
+    }
+
+    private void test_simple_placefile ()
+    {
+      var file = new KeyFile ();
+      try {
+        file.load_from_file (TESTDIR + "/data/place0.place",
+                             KeyFileFlags.NONE);
+      } catch (Error e) {
+          error ("Unable to load test place: %s", e.message);
+      }
+
+      var place = Places.Place.new_from_keyfile (file);
+      assert (place is Places.Place);
+
+      /* Test Place group was loaded properly */
+      assert (place.dbus_name == "org.ayatana.Unity.Place0");
+      assert (place.dbus_path == "/org/ayatana/Unity/Place0");
+
+      /* Test entries were loaded properly */
+      assert (place.n_entries == 0);
+    }
+
+    private void test_advanced_place_file ()
+    {
+      var file = new KeyFile ();
+      try {
+        file.load_from_file (TESTDIR + "/data/place1.place",
+                             KeyFileFlags.NONE);
+      } catch (Error error) {
+          warning ("Unable to load test place: %s", error.message);
+      }
+
+      var place = Places.Place.new_from_keyfile (file);
+      assert (place is Places.Place);
+
+      /* Test Place group was loaded properly */
+      assert (place.dbus_name == "org.ayatana.Unity.Place1");
+      assert (place.dbus_path == "/org/ayatana/Unity/Place1");
+
+      /* Test entries were loaded properly */
+      assert (place.n_entries == 3);
+
+      /* Test individual entry's properties were loaded correctly */
+      PlaceEntry? e;
+
+      e = place.get_nth_entry (0);
+      assert (e is PlaceEntry);
+      assert (e.dbus_path == "/org/ayatana/Unity/Place1/Entry1");
+      assert (e.name == "One");
+      assert (e.icon == "gtk-apply");
+      assert (e.description == "One Description");
+      assert (e.show_global == true);
+      assert (e.show_entry == false);
+
+      e = place.get_nth_entry (1);
+      assert (e is PlaceEntry);
+      assert (e.dbus_path == "/org/ayatana/Unity/Place1/Entry2");
+      assert (e.name == "Two");
+      assert (e.icon == "gtk-close");
+      assert (e.description == "Two Description");
+      assert (e.show_global == false);
+      assert (e.show_entry == true);
+
+      e = place.get_nth_entry (2);
+      assert (e is PlaceEntry);
+      assert (e.dbus_path == "/org/ayatana/Unity/Place1/Entry3");
+      assert (e.name == "Three");
+      assert (e.icon == "gtk-cancel");
+      assert (e.description == "Three Description");
+      assert (e.show_global == false);
+      assert (e.show_entry == false);
+    }
+
+    private void test_bad_simple_place_file ()
+    {
+      var file = new KeyFile ();
+      try {
+        file.load_from_file (TESTDIR + "/data/place0.badplace",
+                             KeyFileFlags.NONE);
+      } catch (Error error) {
+          warning ("Unable to load test place: %s", error.message);
+      }
+
+      if (trap_fork (0, TestTrapFlags.SILENCE_STDOUT | TestTrapFlags.SILENCE_STDERR))
+        {
+          var place = Places.Place.new_from_keyfile (file);
+          assert (place is Places.Place);
+          Posix.exit (0);
+        }
+        trap_has_passed ();
+        trap_assert_stderr ("*Does not contain 'Place' grou*");
+    }
+
+    private void test_bad_advanced_place_file ()
+    {
+      var file = new KeyFile ();
+      try {
+        file.load_from_file (TESTDIR + "/data/place1.badplace",
+                             KeyFileFlags.NONE);
+      } catch (Error error) {
+          warning ("Unable to load test place: %s", error.message);
+      }
+
+      if (trap_fork (0, TestTrapFlags.SILENCE_STDOUT | TestTrapFlags.SILENCE_STDERR))
+        {
+          var place = Places.Place.new_from_keyfile (file);
+          assert (place is Places.Place);
+          Posix.exit (0);
+        }
+        trap_has_passed ();
+        trap_assert_stderr ("*Does not contain valid DBusObjectPat*");
+    }
+  }
+}

=== modified file 'tests/unit/test-unit.vala'
--- tests/unit/test-unit.vala	2010-06-04 17:03:39 +0000
+++ tests/unit/test-unit.vala	2010-06-24 07:45:42 +0000
@@ -24,21 +24,30 @@
 {
   public static int main (string[] args)
   {
+    LauncherSuite launcher;
+
     PanelIndicatorObjectEntryViewSuite panel_object_entry_view_suite;
     PanelIndicatorObjectViewSuite panel_object_view_suite;
-    
+
+    PlacesPlaceFileModelSuite place_file_model;
+    PlacesPlaceSuite places_place;
     PlacesSuite places;
-    LauncherSuite launcher;
     PlaceSuite place;
 
     Gtk.init (ref args);
     Ctk.init (ref args);
     Test.init (ref args);
 
+    /* Launcher tests */
+    launcher = new LauncherSuite ();
+
+    /* Panel tests */
     panel_object_entry_view_suite = new PanelIndicatorObjectEntryViewSuite ();
     panel_object_view_suite = new PanelIndicatorObjectViewSuite ();
-    
-    launcher = new LauncherSuite ();
+    place_file_model = new PlacesPlaceFileModelSuite ();
+    places_place = new PlacesPlaceSuite ();
+
+    /* Places tests */
     places = new PlacesSuite ();
     place = new PlaceSuite ();
 

=== modified file 'unity-private/Makefile.am'
--- unity-private/Makefile.am	2010-06-10 16:42:49 +0000
+++ unity-private/Makefile.am	2010-06-24 07:45:42 +0000
@@ -79,28 +79,25 @@
   panel/panel-indicator-model.vala \
   panel/panel-indicator-object-entry-view.vala \
   panel/panel-indicator-object-view.vala \
-  panel/panel-indicators.vala \
   panel/panel-menu-manager.vala \
   panel/panel-menubar.vala \
   panel/panel-tray.vala \
   panel/panel-view.vala
 
 places_sources = \
-  places/application-place.vala \
-  places/bar-model.vala \
-  places/bar-view.vala \
-  places/cairo-drawing.vala \
-  places/default-model.vala \
-  places/default-view.vala \
-  places/file-place.vala \
   places/places-controller.vala \
-  places/places-model.vala \
+  places/places-default-renderer-group.vala \
+  places/places-default-renderer.vala \
+  places/places-place-bar.vala \
+  places/places-place-entry-view.vala \
+  places/places-place-entry.vala \
+  places/places-place-model.vala \
+  places/places-place-view.vala \
   places/places-place.vala \
-  places/places-place-proxy.vala \
-  places/places-place-view.vala \
-  places/places-results-view.vala \
-  places/places-view.vala \
-  places/search-field.vala
+  places/places-place-search-bar.vala \
+  places/places-place-search-entry.vala \
+  places/places-place-search-sections-bar.vala \
+  places/places-view.vala
 
 launcher_sources = \
   launcher/application-controller.vala \

=== modified file 'unity-private/launcher/launcher-child.vala'
--- unity-private/launcher/launcher-child.vala	2010-06-16 17:10:50 +0000
+++ unity-private/launcher/launcher-child.vala	2010-06-24 07:45:42 +0000
@@ -407,6 +407,10 @@
     private void on_rotation_changed ()
     {
       old_rotate_value = processed_icon.rotation;
+
+      if (rotate_timeline is Clutter.Timeline == false)
+        return;
+
       if (rotate_timeline.is_playing ())
         {
           rotate_timeline.stop ();
@@ -488,7 +492,6 @@
                                                out float minimum_height,
                                                out float natural_height)
     {
-      float nat, min;
       natural_height = 48;
       minimum_height = 48;
     }

=== modified file 'unity-private/launcher/scroller-controller.vala'
--- unity-private/launcher/scroller-controller.vala	2010-06-03 10:17:02 +0000
+++ unity-private/launcher/scroller-controller.vala	2010-06-24 07:45:42 +0000
@@ -171,6 +171,7 @@
         }
     }
 
+    /*
     public void on_favorite_removed (string uid)
     {
     }
@@ -195,7 +196,7 @@
 
       return false;
     }
-
+    */
     private ApplicationController? find_controller_by_desktop_file (string desktop_file)
     {
       foreach (ScrollerChildController controller in childcontrollers)

=== modified file 'unity-private/panel/panel-background.vala'
--- unity-private/panel/panel-background.vala	2010-06-03 09:53:03 +0000
+++ unity-private/panel/panel-background.vala	2010-06-24 07:45:42 +0000
@@ -60,7 +60,7 @@
           last_width = width;
           last_height = height;
 
-          Idle.add (update_background);
+          Timeout.add (0, update_background);
         }
     }
 

=== modified file 'unity-private/panel/panel-home-button.vala'
--- unity-private/panel/panel-home-button.vala	2010-06-21 09:14:43 +0000
+++ unity-private/panel/panel-home-button.vala	2010-06-24 07:45:42 +0000
@@ -42,9 +42,9 @@
       float       pheight;
       Ctk.Padding pad = { 0 };
 
-      lwidth  = (float) this.shell.get_launcher_width_foobar ();
-      pheight = (float) this.shell.get_panel_height_foobar ();
-      this.theme_image.get_preferred_size (out cwidth, out cheight,
+      lwidth  = (float) shell.get_launcher_width_foobar ();
+      pheight = (float) shell.get_panel_height_foobar ();
+      theme_image.get_preferred_size (out cwidth, out cheight,
                                            out cwidth, out cheight);
 
       /* adapt icon-width to launcher-width with padding */
@@ -75,19 +75,20 @@
           pad.bottom = pad.top;
         }
 
-      this.padding = pad;
+      padding = pad;
 
       base.allocate (box, flags);
     }
 
     construct
     {
-      this.theme_image = new ThemeImage ("distributor-logo");
-      this.add_actor (this.theme_image);
-      this.theme_image.show ();
+      theme_image = new ThemeImage ("distributor-logo");
+      add_actor (theme_image);
+      theme_image.show ();
 
-      this.button_press_event.connect (this.on_button_press);
-      this.button_release_event.connect (this.on_button_release);
+      button_press_event.connect (on_button_press);
+      button_release_event.connect (on_button_release);
+      motion_event.connect (on_motion_event);
     }
 
     /* We always want to be the width of the launcher */
@@ -95,8 +96,8 @@
                                                out float min_width,
                                                out float nat_width)
     {
-      min_width = this.shell.get_launcher_width_foobar ();
-      nat_width = this.shell.get_launcher_width_foobar ();
+      min_width = shell.get_launcher_width_foobar ();
+      nat_width = shell.get_launcher_width_foobar ();
     }
 
     private bool on_button_press (Clutter.Event event)
@@ -111,6 +112,13 @@
       manager.popdown_current_menu ();
       return true;
     }
+
+    private bool on_motion_event (Clutter.Event event)
+    {
+      shell.about_to_show_places ();
+
+      return true;
+    }
   }
 }
 

=== removed file 'unity-private/panel/panel-indicators.vala'
--- unity-private/panel/panel-indicators.vala	2010-06-03 10:17:02 +0000
+++ unity-private/panel/panel-indicators.vala	1970-01-01 00:00:00 +0000
@@ -1,659 +0,0 @@
-/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-
-using Gee;
-using Utils;
-
-namespace Unity.Panel.Indicators
-{
-  public class View : Ctk.Box
-  {
-    private HashMap<string, int> indicator_order;
-
-    private Gtk.Menu? popped;
-    private uint32 click_time;
-    private float last_found_entry_x = 0.0f;
-
-    public View ()
-    {
-      Object (orientation:Ctk.Orientation.HORIZONTAL,
-              spacing:0,
-              homogeneous:false,
-              reactive:true);
-
-      Unity.Testing.ObjectRegistry.get_default ().register ("PanelIndicators",
-                                                            this);
-    }
-
-    construct
-    {
-      this.indicator_order = new HashMap<string, int> ();
-
-      this.button_press_event.connect (this.on_button_press_event);
-      this.button_release_event.connect (this.on_button_release_event);
-      this.motion_event.connect (this.on_motion_event);
-      this.scroll_event.connect (on_scroll_event);
-
-      if (Environment.get_variable ("UNITY_DISABLE_IDLES") != null)
-        this.load_indicators ();
-      else
-        Idle.add (this.load_indicators);
-    }
-
-    private bool load_indicators ()
-    {
-      string skip_list;
-
-      /* Create the order */
-      this.indicator_order.set ("libapplication.so", 1);
-      this.indicator_order.set ("libsoundmenu.so", 2);
-      this.indicator_order.set ("libmessaging.so", 3);
-      this.indicator_order.set ("libdatetime.so", 4);
-      this.indicator_order.set ("libme.so", 5);
-      this.indicator_order.set ("libsession.so", 6);
-
-      /* The ones we don't want to load */
-      skip_list = Environment.get_variable ("UNITY_PANEL_INDICATORS_SKIP");
-      if (skip_list == null)
-        skip_list = "";
-      
-      if (skip_list == "all")
-        return false;
-
-      /* We need to look for icons in an specific location */
-      Gtk.IconTheme.get_default ().append_search_path (INDICATORICONSDIR);
-
-      /* Start loading 'em in */
-      var dir = File.new_for_path (INDICATORDIR);
-      try
-        {
-          var e = dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
-                                          0,
-                                          null);
-
-          FileInfo file_info;
-          while ((file_info = e.next_file (null)) != null)
-            {
-              string leaf = file_info.get_name ();
-
-              if (leaf in skip_list || skip_list == "all")
-                continue;
-
-              if (leaf[leaf.len()-2:leaf.len()] == "so")
-                this.load_indicator (INDICATORDIR + file_info.get_name (),
-                                     file_info.get_name ());
-            }
-        }
-      catch (Error error)
-        {
-          print ("Unable to read indicators: %s\n", error.message);        }
-
-      this.sort_children ((CompareFunc)reorder_icons);
-
-      return false;
-    }
-
-    public static int reorder_icons (IndicatorItem a, IndicatorItem b)
-    {
-      return a.position - b.position;
-    }
-
-    private void load_indicator (string filename, string leaf)
-    {
-      Indicator.Object o;
-
-      o = new Indicator.Object.from_file (filename);
-
-      if (o is Indicator.Object)
-        {
-          var i = new IndicatorItem ();
-          i.set_object (o);
-          this.add_actor (i);
-          i.show ();
-
-          i.menu_moved.connect (this.on_menu_moved);
-
-          i.position = (int)this.indicator_order[leaf];
-        }
-      else
-        {
-          warning ("Unable to load %s\n", filename);
-        }
-    }
-
-    private void position_menu (Gtk.Menu menu,
-                                out int  x,
-                                out int  y,
-                                out bool push_in)
-    {
-      y = (int)this.height;
-      x = (int)this.last_found_entry_x;
-    }
-
-    private unowned IndicatorEntry? entry_for_event (float root_x)
-    {
-      unowned IndicatorItem?  item = null;
-      unowned IndicatorEntry? entry = null;
-      float x = root_x - this.x;
-
-      /* Find which entry has the button press, pop it up */
-      unowned GLib.List<IndicatorItem> list = this.get_children ();
-      for (int i = 0; i < list.length (); i++)
-        {
-          unowned IndicatorItem it = (IndicatorItem)list.nth_data (i);
-
-          if (it.x < x && x < (it.x + it.width))
-            {
-              item = it;
-              break;
-            }
-        }
-
-      if (item == null)
-        return null;
-
-      x -= item.x;
-      list = item.get_children ();
-      for (int i = 0; i < list.length (); i++)
-        {
-          unowned IndicatorEntry ent = (IndicatorEntry)list.nth_data (i);
-
-          if (ent.x < x && x < (ent.x + ent.width))
-            {
-              this.last_found_entry_x = ent.x + item.x + this.x;
-              entry = ent;
-            }
-        }
-
-      return entry;
-    }
-
-    public void show_entry (IndicatorEntry entry)
-    {
-      if (this.popped is Gtk.Menu
-          && (this.popped.get_flags () & Gtk.WidgetFlags.VISIBLE) !=0)
-        {
-          this.popped.popdown ();
-          this.popped = null;
-        }
-
-      this.last_found_entry_x = entry.x + entry.get_parent ().x + this.x;
-
-      entry.menu.popup (null,
-                        null,
-                        this.position_menu,
-                        1,
-                        Clutter.get_current_event_time ());
-      click_time = Clutter.get_current_event_time ();
-      this.popped = entry.menu;
-      entry.menu_shown ();
-    }
-
-    private bool on_button_press_event (Clutter.Event e)
-    {
-      if (this.popped is Gtk.Menu
-          && (this.popped.get_flags () & Gtk.WidgetFlags.VISIBLE) !=0)
-        {
-          this.popped.popdown ();
-          this.popped = null;
-        }
-
-      unowned IndicatorEntry? entry = this.entry_for_event (e.button.x);
-      if (entry is IndicatorEntry)
-        {
-          entry.menu.popup (null,
-                            null,
-                            this.position_menu,
-                            e.button.button,
-                            e.button.time);
-         click_time = e.button.time;
-          this.popped = entry.menu;
-          entry.menu_shown ();
-        }
-      return true;
-    }
-
-    private bool on_button_release_event (Clutter.Event e)
-    {
-      if (e.button.time - click_time < 300)
-        return true;
-
-      if (this.popped is Gtk.Menu
-          && (this.popped.get_flags () & Gtk.WidgetFlags.VISIBLE) !=0)
-        {
-          this.popped.popdown ();
-          this.popped = null;
-        }
-
-      return true;
-    }
-
-    private bool on_motion_event (Clutter.Event e)
-    {
-      if (this.popped is Gtk.Menu
-          && (this.popped.get_flags () & Gtk.WidgetFlags.VISIBLE) !=0)
-        {
-          unowned IndicatorEntry? entry;
-
-          entry = entry_for_event (e.motion.x);
-
-          if (entry == null)
-            return true;
-
-          if (entry.menu != this.popped)
-            {
-              this.popped.popdown ();
-              this.popped = entry.menu;
-              this.popped.popup (null,
-                                 null,
-                                 this.position_menu,
-                                 e.button.button,
-                                 e.button.time);
-              entry.menu_shown ();
-            }
-        }
-
-      return true;
-    }
-
-    private bool on_scroll_event (Clutter.Event e)
-    {
-      Clutter.ScrollEvent event = e.scroll;
-
-      unowned IndicatorEntry? entry = this.entry_for_event (e.scroll.x);
-      if (entry is IndicatorEntry)
-        {
-          unowned Indicator.Object object = entry.get_data<Indicator.Object> ("Indicator.Object");
-
-          Signal.emit_by_name (object, "scroll", 1, event.direction);
-        }
-      return true;
-    }
-
-    private void on_menu_moved (IndicatorItem         item,
-                                Gtk.MenuDirectionType type)
-    {
-      unowned GLib.List<IndicatorItem> list = this.get_children ();
-
-      int pos = list.index (item);
-
-      if (pos == -1)
-          return;
-
-      /* For us, PARENT = previous menu, CHILD = next menu */
-      if (type == Gtk.MenuDirectionType.PARENT)
-        {
-          if (pos == 0)
-              return;
-          pos -= 1;
-        }
-      else if (type == Gtk.MenuDirectionType.CHILD)
-        {
-          if (pos == list.length ()-1)
-              return;
-          pos +=1;
-        }
-
-      /* Get the prev/next item */
-      IndicatorItem new_item = list.nth_data (pos) as IndicatorItem;
-
-      /* Find the right entry to activate */
-      unowned GLib.List<IndicatorEntry> l = new_item.get_children ();
-      int p = type == Gtk.MenuDirectionType.PARENT ? (int)l.length ()-1 : 0;
-      IndicatorEntry? new_entry = l.nth_data (p) as IndicatorEntry;
-
-      if (new_entry is IndicatorEntry)
-        this.show_entry (new_entry);
-    }
-  }
-
-  public class IndicatorItem : Ctk.Box
-  {
-    /**
-     * Represents one Indicator.Object
-     **/
-    private Indicator.Object object;
-    public  int              position;
-
-    public signal void menu_moved (Gtk.MenuDirectionType type);
-
-    public IndicatorItem ()
-    {
-      Object (orientation:Ctk.Orientation.HORIZONTAL,
-              spacing:0,
-              homogeneous:false);
-    }
-
-    construct
-    {
-    }
-
-    private void remove_entry (Indicator.ObjectEntry entry)
-    {
-      unowned GLib.List<IndicatorEntry> list = this.get_children ();
-
-      for (int i = 0; i < list.length (); i++)
-        {
-          IndicatorEntry e;
-
-          e = (IndicatorEntry) list.nth_data (i);
-
-          if (e.entry == entry)
-            {
-              this.remove_actor (e);
-            }
-        }
-    }
-
-    private void create_entry (Indicator.ObjectEntry entry,
-                               Indicator.Object      object)
-    {
-      IndicatorEntry e = new IndicatorEntry (entry);
-      e.set_data ("Indicator.Object", object);
-      this.add_actor (e);
-      this.show ();
-
-      e.menu_moved.connect (this.on_menu_moved);
-    }
-
-    private void on_menu_moved (IndicatorEntry        entry,
-                                Gtk.MenuDirectionType type)
-    {
-      unowned GLib.List<IndicatorEntry> list = this.get_children ();
-
-      int pos = list.index (entry);
-
-      if (pos == -1)
-        {
-          this.menu_moved (type);
-          return;
-        }
-
-      /* For us, PARENT = previous menu, CHILD = next menu */
-      if (type == Gtk.MenuDirectionType.PARENT)
-        {
-          if (pos == 0)
-            {
-              this.menu_moved (type);
-              return;
-            }
-          pos -= 1;
-        }
-      else if (type == Gtk.MenuDirectionType.CHILD)
-        {
-          if (pos == list.length ()-1)
-            {
-              this.menu_moved (type);
-              return;
-            }
-          pos +=1;
-        }
-
-      IndicatorEntry new_entry = list.nth_data (pos) as IndicatorEntry;
-
-      Indicators.View parent = this.get_parent () as Indicators.View;
-      parent.show_entry (new_entry);
-    }
-
-    private void on_entry_added (Indicator.Object      object,
-                                 Indicator.ObjectEntry entry)
-    {
-      create_entry (entry, object);
-    }
-
-    public void set_object (Indicator.Object object)
-    {
-      this.object = object;
-
-      object.entry_added.connect (this.on_entry_added);
-      object.entry_removed.connect (this.remove_entry);
-
-      unowned GLib.List<Indicator.ObjectEntry> list = object.get_entries ();
-
-      for (int i = 0; i < list.length (); i++)
-        {
-          unowned Indicator.ObjectEntry entry;
-
-          entry = (Indicator.ObjectEntry) list.nth_data (i);
-
-          this.create_entry (entry, object);
-        }
-    }
-
-    public Indicator.Object get_object ()
-    {
-      return this.object;
-    }
-  }
-
-  public class IndicatorEntry : Ctk.Box
-  {
-    public unowned Indicator.ObjectEntry entry { get; construct; }
-
-    private Clutter.CairoTexture bg;
-
-    private Ctk.Image     image;
-    private Ctk.Text      text;
-
-    public Gtk.Menu menu { get { return this.entry.menu; } }
-
-    public signal void menu_moved (Gtk.MenuDirectionType type);
-
-    public IndicatorEntry (Indicator.ObjectEntry entry)
-    {
-      Object (entry:entry,
-              orientation:Ctk.Orientation.HORIZONTAL,
-              spacing:4,
-              reactive:false);
-    }
-
-    construct
-    {
-      this.padding = { 0, 3.0f, 0, 3.0f };
-
-      this.bg = new Clutter.CairoTexture (10, 10);
-      this.bg.set_parent (this);
-      this.bg.opacity = 0;
-      this.bg.show ();
-
-      if (this.entry.image is Gtk.Image)
-        {
-          this.image = new Ctk.Image (22);
-          this.add_actor (this.image);
-          this.image.show ();
-
-          if (this.entry.image.icon_name != null)
-            {
-
-              this.image.stock_id = this.entry.image.icon_name;
-
-              this.entry.image.notify["icon-name"].connect (() =>
-                {
-                  this.image.stock_id = this.entry.image.icon_name;
-                });
-
-              unowned Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
-              theme.changed.connect (() =>
-                {
-                  this.image.stock_id = this.entry.image.icon_name;
-                });
-            }
-
-          if (this.entry.image.pixbuf != null)
-            {
-              this.image.pixbuf = this.entry.image.pixbuf;
-              this.image.size = this.entry.image.pixbuf.width;
-
-              this.entry.image.notify["pixbuf"].connect (() =>
-                {
-                  this.image.pixbuf = this.entry.image.pixbuf;
-                  this.image.size = this.entry.image.pixbuf.width;
-                });
-            }
-        }
-
-      if (this.entry.label is Gtk.Label)
-        {
-          this.text = new Ctk.Text ("");
-          this.text.color = { 233, 216, 200, 255 };
-          this.add_actor (this.text);
-          this.text.show ();
-
-          this.text.text = this.entry.label.label;
-
-          this.entry.label.notify["label"].connect (() =>
-            {
-              this.text.text = this.entry.label.label;
-            });
-        }
-    }
-
-    public void menu_shown ()
-    {
-      if (this.entry.menu is Gtk.Menu)
-        {
-          this.entry.menu.move_current.connect (this.menu_key_moved);
-          this.entry.menu.notify["visible"].connect (this.menu_vis_changed);
-          this.bg.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200,
-                           "opacity", 255);
-
-          Clutter.Color col = { 255, 249, 233, 255 };
-          this.text.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200,
-                             "color", ref col);
-        }
-    }
-
-    public void menu_vis_changed ()
-    {
-      bool vis = (this.entry.menu.get_flags () & Gtk.WidgetFlags.VISIBLE) != 0;
-
-      if (vis == false)
-        {
-          this.bg.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200,
-                           "opacity", 0);
-
-          Clutter.Color col = { 233, 216, 200, 255 };
-          this.text.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200,
-                             "color", ref col);
-          this.entry.menu.move_current.disconnect (this.menu_key_moved);
-          this.entry.menu.notify["visible"].disconnect (this.menu_vis_changed);
-        }
-    }
-
-    public void menu_key_moved (Gtk.MenuDirectionType type)
-    {
-      if (type != Gtk.MenuDirectionType.PARENT &&
-          type != Gtk.MenuDirectionType.CHILD)
-        return;
-
-      this.menu_moved (type);
-    }
-
-    private void update_bg (int width, int height)
-    {
-      Cairo.Context cr;
-
-      this.bg.set_surface_size (width, height);
-
-      cr = this.bg.create ();
-
-      cr.set_operator (Cairo.Operator.CLEAR);
-      cr.paint ();
-
-      cr.set_operator (Cairo.Operator.OVER);
-
-      cr.set_line_width (1.0);
-
-      cr.set_source_rgba (1.0, 1.0, 1.0, 0.2);
-
-      cr.move_to (1, height);
-
-      cr.line_to (1, 7);
-
-      cr.curve_to (1, 2,
-                   1, 2,
-                   10, 2);
-
-      cr.line_to (width-10, 2);
-
-      cr.curve_to (width, 2,
-                   width, 2,
-                   width, 7);
-
-      cr.line_to (width, height);
-
-      cr.line_to (1, height);
-
-      var pat = new Cairo.Pattern.linear (1, 0, 1, height);
-      pat.add_color_stop_rgba (0.0, 0.8509f, 0.8196f, 0.7294f, 1.0f);
-      pat.add_color_stop_rgba (1.0, 0.7019f, 0.6509f, 0.5137f, 1.0f);
-
-      cr.set_source (pat);
-      cr.fill ();
-    }
-
-    /*
-     * CLUTTER OVERRIDES
-     */
-    private override void allocate (Clutter.ActorBox        box,
-                                    Clutter.AllocationFlags flags)
-    {
-      float width;
-      float height;
-
-      base.allocate (box, flags);
-
-      width = Math.floorf (box.x2 - box.x1);
-      height = Math.floorf (box.y2 - box.y1) - 1;
-
-      Clutter.ActorBox child_box = { 0 };
-      child_box.x1 = 0;
-      child_box.x2 = width;
-      child_box.y1 = 0;
-      child_box.y2 = height;
-
-      if (width != this.bg.width ||
-          height != this.bg.height)
-        {
-          this.update_bg ((int)width, (int)height);
-        }
-
-      this.bg.allocate (child_box, flags);
-    }
-
-    private override void paint ()
-    {
-      this.bg.paint ();
-      base.paint ();
-    }
-
-    private override void map ()
-    {
-      base.map ();
-      this.bg.map ();
-    }
-
-    private override void unmap ()
-    {
-      base.unmap ();
-      this.bg.unmap ();
-    }
-  }
-}

=== modified file 'unity-private/panel/panel-menubar.vala'
--- unity-private/panel/panel-menubar.vala	2010-06-02 13:48:28 +0000
+++ unity-private/panel/panel-menubar.vala	2010-06-24 07:45:42 +0000
@@ -22,6 +22,8 @@
 {
   public class MenuBar : Ctk.Box
   {
+    public IndicatorObjectView indicator_object_view;
+
     public MenuBar ()
     {
       Object (spacing:0,
@@ -40,7 +42,7 @@
 
           if (name ==  "libappmenu.so")
             {
-              IndicatorObjectView indicator_object_view = new IndicatorObjectView (o);
+              indicator_object_view = new IndicatorObjectView (o);
               indicator_object_view.menu_moved.connect (this.on_menu_moved);
 
               pack (indicator_object_view, false, true);

=== modified file 'unity-private/panel/panel-view.vala'
--- unity-private/panel/panel-view.vala	2010-06-18 15:42:52 +0000
+++ unity-private/panel/panel-view.vala	2010-06-24 07:45:42 +0000
@@ -56,7 +56,7 @@
       bground = new Background ();
       set_background (bground);
       bground.show ();
-      
+
       /* Create the views and add them to the box */
       home_button = new HomeButton (shell);
       pack (home_button, false, true);
@@ -74,7 +74,7 @@
       pack (indicator_bar, false, true);
       indicator_bar.show ();
 
-      this.button_release_event.connect (this.on_button_release_event);
+      button_release_event.connect (on_button_release_event);
 
       END_FUNCTION ();
     }
@@ -89,50 +89,17 @@
 
     public int get_indicators_width ()
     {
-      return (int) this.indicator_bar.get_width ();
-      //this.system_tray.width + this.indicator_bar.width;
+      return (int) indicator_bar.get_width ();
+      //system_tray.width + indicator_bar.width;
     }
 
     public void set_expanded (bool _expanded)
     {
       // Hide menubar
       // Put background into expanded mode
-      this.expanded = _expanded;
+      expanded = _expanded;
     }
 
-//     private override void allocate (Clutter.ActorBox        box,
-//                                     Clutter.AllocationFlags flags)
-//     {
-//       Clutter.ActorBox child_box = { 0, 0, box.x2 - box.x1, box.y2 - box.y1 };
-//       float            width;
-//       float            child_width;
-//
-//       base.allocate (box, flags);
-//
-//       width = box.x2 - box.x1;
-//
-//       this.rect.set_clip (0, 0, width, box.y2 - box.y1);
-//
-//       First the background
-//       child_box.y2 += 3.0f;
-//       this.rect.allocate (child_box, flags);
-// //
-// //       Home button
-// //       child_box.x1 = 0;
-// //       child_box.x2 = 60;
-// //       child_box.y1 = 0;
-// //       child_box.y2 = PANEL_HEIGHT;
-// //       this.home.allocate (child_box, flags);
-//
-//       this.indicator_bar.get_preferred_width (PANEL_HEIGHT,
-//                                            out child_width,
-//                                            out child_width);
-//       child_box.x1 = width - child_width;
-//       child_box.x2 = width;
-//       this.indicator_bar.allocate (child_box, flags);
-//     }
-
-
     public int get_panel_height ()
     {
       return Unity.Panel.PANEL_HEIGHT;
@@ -140,20 +107,24 @@
 
     public void set_indicator_mode (bool mode)
     {
-    	if (mode)
-    		{
-          menu_bar.hide ();
+      if (mode)
+        {
+         if (menu_bar.indicator_object_view is Clutter.Actor)
+            menu_bar.indicator_object_view.hide ();
           bground.hide ();
           system_tray.hide ();
           indicator_bar.set_indicator_mode (mode);
-    		}
-    	else
+          reactive = false;
+        }
+      else
         {
-          menu_bar.show ();
+          if (menu_bar.indicator_object_view is Clutter.Actor)
+            menu_bar.indicator_object_view.show ();
           bground.show ();
           system_tray.show ();
           indicator_bar.set_indicator_mode (mode);
-    		}
+          reactive = true;
+      }
     }
   }
 }

=== removed file 'unity-private/places/application-place.vala'
--- unity-private/places/application-place.vala	2010-05-31 17:58:13 +0000
+++ unity-private/places/application-place.vala	1970-01-01 00:00:00 +0000
@@ -1,297 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Jay Taoko <[e-mail]>
- *
- */
- 
-namespace Unity.Places.Application
-{
-
-  const string APP_ICON = Unity.PKGDATADIR + "/applications.png";
-  const string FAVOURITES_ICON = Unity.PKGDATADIR + "/favourites.png";
-  const string MINIMIZE_ICON = Unity.PKGDATADIR + "/minimize_up.png";
-  const string MAXIMIZE_ICON = Unity.PKGDATADIR + "/maximize_up.png";
-
-  public class ApplicationIcon
-  {
-    private Unity.Places.Bar.Model model;
-    public Ctk.Image view;
-    public Ctk.Text label;
-
-    public ApplicationIcon (int width, /*int height,*/ string name, string icon_name, string tooltip)
-    {
-      model = new Unity.Places.Bar.Model (name, icon_name, tooltip);
-
-      if (icon_name[0] == '/')
-        view = new Ctk.Image.from_filename (width, icon_name);
-      else if (icon_name[-4] == '.')
-        view = new Ctk.Image.from_filename (width,
-                                            "/usr/share/pixmaps/" + icon_name);
-      else if (icon_name[0] == '.')
-        {
-          GLib.Icon icon;
-
-	  try
-	    {
-              icon = GLib.Icon.new_for_string(icon_name);
-              Gtk.IconInfo info = Gtk.IconTheme.get_default().lookup_by_gicon (icon, 48, 0);
-              if (info != null)
-                view = new Ctk.Image.from_filename (width, info.get_filename());
-              else
-                view = new Ctk.Image.from_stock (width, icon_name);
-              if (view == null)
-                warning (@"Failed to load icon for $icon_name");
-	    }
-	  catch (GLib.Error error)
-	    {
-	      warning (@"Failed to load icon: %s", error.message);
-	    }
-        }
-      else
-        view = new Ctk.Image.from_stock (width, icon_name);
-
-      view.set_reactive (true);
-      label = new Ctk.Text (name);
-      label.set_line_wrap (true);
-      label.set_line_alignment (Pango.Alignment.CENTER);
-    }
-  }
-
-  public class ApplicationGroup : Ctk.Box
-  {
-    public  int n_items = 0;
-
-    private Ctk.Text GroupName;
-    private Ctk.Image Star;
-    private Unity.Places.CairoDrawing.PlacesHSeparator Separator;
-    private Ctk.Image maximize_button;
-    private Ctk.Image minimize_button;
-    private bool is_open;
-    private Gee.ArrayList<ApplicationIcon> application_icon_array;
-
-
-    public override void allocate (Clutter.ActorBox        box,
-                                   Clutter.AllocationFlags flags)
-    {
-      int width = (int)(box.x2 - box.x1);
-      int IconWidth = 120;
-      int IconHeight = 48;
-      int ApplicationIconSpacing = 24;
-
-      int HeaderBorderPositionX = 0;
-      int HeaderBorderPositionY = 0;
-      int IconBorderPositionX = 15;
-      int IconBorderPositionY = 30;
-      int LineBorderPositionX = 0;
-      int LineBorderPositionY = 20;
-
-      Clutter.ActorBox child_box = { 0.0f, 0.0f, 0.0f, 0.0f };
-
-      base.allocate (box, flags);
-
-      child_box.x1 = IconBorderPositionX;
-      child_box.x2 = IconWidth;
-      child_box.y1 = IconBorderPositionY;
-      child_box.y2 = child_box.y1 + IconHeight;
-
-      int i;
-      for (i = 0; i < this.application_icon_array.size; i++)
-        {
-          child_box.x2 = child_box.x1 + IconWidth;
-          this.application_icon_array[i].view.allocate(child_box, flags);
-
-          Clutter.ActorBox label_box = { 0.0f, 0.0f, 0.0f, 0.0f };
-          label_box.x1 = child_box.x1;
-          label_box.x2 = child_box.x2;
-          label_box.y1 = IconBorderPositionY + IconHeight + 12.0f;
-          label_box.y2 = label_box.y1 + 64;
-          this.application_icon_array[i].label.allocate(label_box, flags);
-
-          child_box.x1 += IconWidth + ApplicationIconSpacing;
-        }
-
-      if (this.Separator.Width != width)
-        {
-          this.Separator.CreateSeparator ( width, 5);
-        }
-      child_box.x1 = LineBorderPositionX;
-      child_box.x2 = child_box.x1 + width;
-      child_box.y1 = LineBorderPositionY;
-      child_box.y2 = LineBorderPositionY + 5;
-      this.Separator.allocate (child_box, flags);
-
-      child_box.x1 = HeaderBorderPositionX;
-      child_box.x2 = child_box.x1 + 22;
-      child_box.y1 = HeaderBorderPositionY;
-      child_box.y2 = HeaderBorderPositionY+ 23;
-      this.Star.allocate (child_box, flags);
-
-      child_box.x1 = HeaderBorderPositionX + 22;
-      child_box.x2 = child_box.x1 + 100;
-      child_box.y1 = HeaderBorderPositionY;
-      child_box.y2 = HeaderBorderPositionY + 23;
-      this.GroupName.allocate (child_box, flags);
-
-      child_box.x1 += width - 50;
-      child_box.x2 = child_box.x1 + 16;
-      child_box.y1 = HeaderBorderPositionY;
-      child_box.y2 = HeaderBorderPositionY + 19;
-      this.maximize_button.allocate (child_box, flags);
-      this.minimize_button.allocate (child_box, flags);
-    }
-
-    public override void get_preferred_width (float for_height,
-                                              out float minimum_width,
-                                              out float natural_width)
-    {
-      minimum_width = 800.0f;
-      natural_width = 800.0f;
-    }
-
-    public override void get_preferred_height (float for_width,
-                                               out float minimum_height,
-                                               out float natural_height)
-    {
-      minimum_height = 135.0f;
-      natural_height = 135.0f;
-    }
-
-    public ApplicationGroup (string group_name)
-    {
-      this.homogeneous  = false;
-      this.orientation  = Ctk.Orientation.HORIZONTAL;
-
-      this.GroupName = new Ctk.Text (group_name);
-      this.Star = new Ctk.Image.from_filename (23, FAVOURITES_ICON);
-      this.Separator = new Unity.Places.CairoDrawing.PlacesHSeparator ();
-      this.maximize_button = new Ctk.Image.from_filename (16, MAXIMIZE_ICON);
-      this.minimize_button = new Ctk.Image.from_filename (16, MINIMIZE_ICON);
-
-      application_icon_array = new Gee.ArrayList<ApplicationIcon> ();
-      /*
-      for (int i = 0; i < 5; i++)
-      {
-        ApplicationIcon app = new ApplicationIcon (48, "App",
-                                      APP_ICON,
-                                      "Your apps stored locally");
-        this.application_icon_array.add (app);
-        this.add_actor (app.view);
-        this.add_actor (app.label);
-      }
-*/
-      this.add_actor (this.Star);
-      this.add_actor (this.Separator);
-      this.add_actor (this.GroupName);
-      this.add_actor (this.maximize_button);
-      this.add_actor (this.minimize_button);
-
-      this.is_open = true;
-      this.show_all ();
-
-      this.maximize_button.set_reactive (true);
-      this.minimize_button.set_reactive (true);
-      this.maximize_button.hide();
-      this.minimize_button.show();
-
-      this.maximize_button.button_release_event.connect (this.on_maximize);
-      this.minimize_button.button_release_event.connect (this.on_minimize);
-    }
-
-    public void add_icon (ApplicationIcon app)
-    {
-      this.application_icon_array.add (app);
-      this.add_actor (app.view);
-      this.add_actor (app.label);
-
-      this.n_items++;
-    }
-
-    construct
-    {
-    }
-
-    public bool on_minimize (Clutter.Event event)
-    {
-      this.maximize_button.show();
-      this.minimize_button.hide();
-      this.is_open = false;
-      return false;
-    }
-
-    public bool on_maximize (Clutter.Event event)
-    {
-      this.maximize_button.hide();
-      this.minimize_button.show();
-      this.is_open = true;
-      return false;
-    }
-  }
-
-  public class ApplicationView : Ctk.Box
-  {
-    public ApplicationGroup recent_app_group;
-    public ApplicationGroup yesterday_app_group;
-    public ApplicationGroup lastweek_app_group;
-    public override void allocate (Clutter.ActorBox        box,
-                                   Clutter.AllocationFlags flags)
-    {
-      Clutter.ActorBox child_box = { 0.0f, 0.0f, 0.0f, 0.0f };
-      float            width, height;
-      float            child_width, child_height;
-
-      base.allocate (box, flags);
-
-      width = box.x2 - box.x1;
-      height = box.y2 - box.y1;
-
-      this.recent_app_group.get_preferred_width (height,
-                                                 out child_width,
-                                                 out child_width);
-      this.recent_app_group.get_preferred_height (width,
-                                                  out child_height,
-                                                  out child_height);
-      child_box.x1 = (width - child_width)/2.0f;
-      child_box.x2 = child_box.x1 + child_width;
-      child_box.y1 = 0.0f;
-      child_box.y2 = child_height;
-      recent_app_group.allocate (child_box, flags);
-
-      child_box.y1 += child_height;
-      child_box.y2 = child_box.y1 + child_height;
-      yesterday_app_group.allocate (child_box, flags);
-
-      child_box.y1 += child_height;
-      child_box.y2 = child_box.y1 + child_height;
-      lastweek_app_group.allocate (child_box, flags);
-    }
-
-    public ApplicationView ()
-    {
-      recent_app_group = new ApplicationGroup ("Recent apps");
-      yesterday_app_group = new ApplicationGroup ("Yesterday apps");
-      lastweek_app_group = new ApplicationGroup ("Last week apps");
-
-      this.add_actor (recent_app_group);
-      this.add_actor (yesterday_app_group);
-      this.add_actor (lastweek_app_group);
-      this.show_all ();
-    }
-
-    construct
-    {
-    }
-  }
-}

=== removed file 'unity-private/places/bar-model.vala'
--- unity-private/places/bar-model.vala	2009-12-14 14:14:37 +0000
+++ unity-private/places/bar-model.vala	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Mirco "MacSlow" Müller <[e-mail]>
- *
- */
-
-using GLib;
-
-namespace Unity.Places.Bar
-{
-  public class Model : Object
-  {
-    public string name;
-    public string icon_name;
-    public string tooltip;
-
-    public Model (string name,
-                  string icon_name,
-                  string tooltip)
-    {
-      this.name      = name;
-      this.icon_name = icon_name;
-      this.tooltip   = tooltip;
-    }
-
-    construct
-    {
-    }
-  }
-}

=== removed file 'unity-private/places/bar-view.vala'
--- unity-private/places/bar-view.vala	2010-01-24 20:13:39 +0000
+++ unity-private/places/bar-view.vala	1970-01-01 00:00:00 +0000
@@ -1,253 +0,0 @@
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Mirco "MacSlow" Müller <[e-mail]>
- *             Neil Jagdish Patel <[e-mail]>
- *
- */
-
-namespace Unity.Places.Bar
-{
-  const float PANEL_HEIGHT    = 24;
-  const int   ICON_SIZE       = 48;
-  const float ICON_VIEW_WIDTH = 80.0f;
-  const float ICON_VIEW_Y1    = 8.0f;
-  const float QL_PAD          = 12.0f;
-
-  const string TRASH_FILE = Unity.PKGDATADIR + "/trash.png";
-
-  public class View : Ctk.Box
-  {
-    public Places.Model model { get; construct; }
-    public Shell        shell { get; construct; }
-
-    private Gee.ArrayList<PlaceIcon> places_icons;
-    private PlaceIcon                trash_icon;
-
-    private Unity.Places.CairoDrawing.PlacesVSeparator separator;
-    private Unity.Places.CairoDrawing.PlacesBackground bg;
-
-    public View (Places.Model model, Shell shell)
-    {
-      Ctk.EffectGlow         glow;
-      Clutter.Color          white = {255, 255, 255, 255};
-
-      Object (model:model, shell:shell);
-
-      /* We do our own allocation, but this doesn't hurt */
-      this.homogeneous  = false;
-      this.orientation  = Ctk.Orientation.HORIZONTAL;
-
-      /* The background of the entire places bar */
-      this.bg = new Unity.Places.CairoDrawing.PlacesBackground ();
-      this.bg.set_parent (this);
-      this.bg.show ();
-      /* Make sure the bg is updated when the indicators change */
-      this.shell.indicators_changed.connect (this.on_indicators_changed);
-
-      /* This'll be populated in an idle by the model */
-      this.places_icons = new Gee.ArrayList<PlaceIcon> ();
-      this.model.place_added.connect (this.on_place_added);
-
-      /* Create trash icon */
-      this.trash_icon = new PlaceIcon (ICON_SIZE,
-                                       "Trash",
-                                       TRASH_FILE,
-                                       "Your piece of waste");
-      glow = new Ctk.EffectGlow ();
-      glow.set_color (white);
-      glow.set_factor (1.0f);
-      glow.set_margin (6);
-      this.trash_icon.add_effect (glow);
-
-      this.pack (this.trash_icon, false, false);
-      this.trash_icon.button_release_event.connect (this.on_button_release);
-
-      /* Create the separator */
-      this.separator = new Unity.Places.CairoDrawing.PlacesVSeparator ();
-      this.pack (this.separator, false, false);
-
-      this.show_all ();
-    }
-
-    private void on_place_added (Place place)
-    {
-      Clutter.Color white = {255, 255, 255, 255};
-
-      var icon = new PlaceIcon.from_place (ICON_SIZE, place);
-      this.places_icons.add (icon);
-
-      var glow = new Ctk.EffectGlow ();
-      glow.set_color (white);
-      glow.set_factor (1.0f);
-      glow.set_margin (6);
-      icon.add_effect (glow);
-
-      this.pack (icon, false, false);
-      icon.button_release_event.connect (this.on_button_release);
-
-      if (this.places_icons.size == 1)
-        {
-          Clutter.Actor stage = icon.get_stage ();
-          this.bg.create_places_background ((int)stage.width,
-                                            (int)stage.height,
-                                            (int)(this.padding.left + QL_PAD),
-                                            (int)ICON_VIEW_WIDTH,
-                                            this.shell.get_indicators_width());
-
-          icon.place.active = true;
-        }
-    }
-
-    private void on_indicators_changed (int width)
-    {
-      Clutter.Actor stage = this.get_stage ();
-      this.bg.create_places_background ((int)stage.width,
-                                        (int)stage.height,
-                                        (int)(this.padding.left + QL_PAD),
-                                        (int)ICON_VIEW_WIDTH,
-                                        width);
-      this.queue_relayout ();
-    }
-
-    public override void map ()
-    {
-      base.map ();
-      this.bg.map ();
-    }
-
-    public override void unmap ()
-    {
-      base.unmap ();
-      this.bg.unmap ();
-    }
-
-    public override void paint ()
-    {
-     this.bg.paint ();
-     base.paint ();
-    }
-
-    public override void allocate (Clutter.ActorBox        box,
-                                   Clutter.AllocationFlags flags)
-    {
-      Clutter.ActorBox        child_box = {0, 0, 0, 0};
-      child_box.x1 = 0.0f;
-      child_box.x2 = box.x2 - box.x1;
-      child_box.y1 = 0.0f;
-      child_box.y2 = box.y2 - box.y1;
-
-      this.bg.allocate (child_box, flags);
-
-      /* Allocate the places icons */
-      var n_places = 0;
-      var lpadding = this.padding.left + QL_PAD;
-
-      child_box.y1 = ICON_VIEW_Y1;
-      child_box.y2 = child_box.y1 + ICON_SIZE;
-
-      foreach (PlaceIcon place in this.places_icons)
-        {
-          child_box.x1 = lpadding +  (ICON_VIEW_WIDTH * n_places);
-          child_box.x2 = child_box.x1 +  ICON_VIEW_WIDTH;
-
-          place.allocate (child_box, flags);
-
-          n_places++;
-        }
-
-      /* Allocate the Trash (24 = Padding) */
-      var i_width = this.shell.get_indicators_width () + 8;
-      child_box.x1 = box.x2 - box.x1 - i_width - ICON_VIEW_WIDTH;
-      child_box.x2 = child_box.x1 + ICON_VIEW_WIDTH;
-      this.trash_icon.allocate (child_box, flags);
-
-      /* Allocate the seperator */
-      child_box.x1 -= 12.0f;
-      child_box.x2 = child_box.x1 + 5;
-      child_box.y1 = 10;
-      child_box.y2 = ICON_SIZE;
-      this.separator.allocate (child_box, flags);
-    }
-
-    public bool on_button_release (Clutter.Event event)
-    {
-      Clutter.Actor actor;
-      actor = event.button.source;
-
-      if (actor is PlaceIcon)
-        {
-          PlaceIcon     icon = actor as PlaceIcon;
-
-          /* Do something with the click */
-          if (actor == this.trash_icon)
-            {
-              try
-                {
-                  Process.spawn_command_line_async ("xdg-open trash:///");
-                }
-              catch (SpawnError e)
-                {
-                  warning ("Unable to show Trash: %s", e.message);
-                }
-            }
-          else if (icon.place is Place)
-            {
-              Clutter.Actor stage = actor.get_stage ();
-
-              /* Update the background */
-              this.bg.create_places_background ((int)stage.width,
-                                                (int)stage.height,
-                                                (int)actor.x,
-                                                80,
-                                                this.shell.get_indicators_width());
-
-              /* Set the place as active, unset the others */
-              foreach (PlaceIcon picon in this.places_icons)
-                {
-                  if (picon.place is Place)
-                    picon.place.active = (picon == icon) ? true : false;
-                }
-            }
-
-          return true;
-        }
-
-      return false;
-    }
-  }
-
-  public class PlaceIcon : Ctk.Image
-  {
-    public Place? place { get; set; }
-
-    public PlaceIcon (int       width,
-                      string name,
-                      string    icon_name,
-                      string    tooltip)
-    {
-      Object (size:width);
-
-      this.set_from_filename (icon_name);
-      this.reactive = true;
-    }
-
-    public PlaceIcon.from_place (int size, Place place)
-    {
-      this(size, place.name, place.icon_name, "");
-      this.place = place;
-    }
-  }
-}

=== removed file 'unity-private/places/cairo-drawing.vala'
--- unity-private/places/cairo-drawing.vala	2010-04-07 21:28:27 +0000
+++ unity-private/places/cairo-drawing.vala	1970-01-01 00:00:00 +0000
@@ -1,474 +0,0 @@
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Jay Taoko <[e-mail]>
- *
- */
-
-namespace Unity.Places.CairoDrawing
-{
-  /* Margin outside of the cairo texture. We draw outside to complete the line loop
-  * and we don't want the line loop to be visible in some parts of the screen.
-  * */
-  private int Margin = 5;
-
-  public class PlacesBackground : Ctk.Bin
-  {
-    public Clutter.CairoTexture cairotxt;
-
-    private Ctk.EffectGlow effect_glow;
-
-    /* (X, Y) origine of Places Bar: The top-left corner of the screen */
-    private int PlaceX = 0;
-    private int PlaceY = 0;
-
-    /* Places Bar width and height. The width is set the the width of the window. */
-    private int PlaceW = 760;
-    private int PlaceH = 55;
-
-    private int PlaceBottom; /* PlaceY + PlaceH */
-
-    /* Menu area width and height */
-    private int MenuH = 22;
-    private int MenuW = 100;
-
-    private int MenuBottom; /* PlaceY + MenuH */
-
-    private int TabH = 50;
-
-    /* The squirl area width */
-    private int SquirlW = 66;
-
-    public struct TabRect
-    {
-      int left;
-      int right;
-      int top;
-      int bottom;
-    }
-
-    public int PlaceWidth;
-
-    void DrawAroundMenu (Cairo.Context cairoctx)
-    {
-      int radius = 8;
-      cairoctx.line_to (PlaceX + PlaceW + Margin, PlaceY + MenuH);
-      cairoctx.line_to (PlaceX + PlaceW - MenuW + radius, PlaceY + MenuH);
-
-      int arc_center_x = PlaceX + PlaceW - MenuW + radius;
-      int arc_center_y = PlaceY + MenuH + radius;
-
-      cairoctx.arc_negative ( (double)arc_center_x, (double)arc_center_y, radius, 3.0*Math.PI/2.0, Math.PI);
-
-      cairoctx.line_to (PlaceX + PlaceW - MenuW, PlaceY + PlaceH - radius);
-
-      arc_center_x = PlaceX + PlaceW - MenuW - radius;
-      arc_center_y = PlaceY + PlaceH - radius;
-      cairoctx.arc ( (double)arc_center_x, (double)arc_center_y, radius, 0.0, Math.PI/2.0);
-    }
-
-    void DrawTab(Cairo.Context cairoctx, TabRect tab)
-    {
-      int radius = 5;
-      int radius_small = 5;
-      int arc_center_x;
-      int arc_center_y;
-
-      cairoctx.line_to (tab.right + radius_small, PlaceBottom );
-
-      arc_center_x = tab.right + radius_small;
-      arc_center_y = PlaceBottom - radius_small;
-      cairoctx.arc ( (double)arc_center_x, (double)arc_center_y, radius_small, Math.PI/2.0, Math.PI);
-
-      cairoctx.line_to (tab.right, tab.top + radius);
-
-      arc_center_x = tab.right - radius;
-      arc_center_y = tab.top + radius;
-      cairoctx.arc_negative ( (double)arc_center_x, (double)arc_center_y, radius, 0.0, 3.0*Math.PI/2.0);
-
-      cairoctx.line_to (tab.left + radius, tab.top);
-
-      arc_center_x = tab.left + radius;
-      arc_center_y = tab.top + radius;
-      cairoctx.arc_negative ( (double)arc_center_x, (double)arc_center_y, radius, 3.0*Math.PI/2.0, Math.PI);
-
-      cairoctx.line_to (tab.left, PlaceBottom - radius_small);
-
-      arc_center_x = tab.left - radius_small;
-      arc_center_y = PlaceBottom - radius_small;
-      cairoctx.arc ( (double)arc_center_x, (double)arc_center_y, radius_small, 0.0, Math.PI/2.0);
-    }
-
-    void DrawSquirl(Cairo.Context cairoctx)
-    {
-      int radius_small = 5;
-      int arc_center_x;
-      int arc_center_y;
-
-      cairoctx.line_to (PlaceX + SquirlW + radius_small, PlaceBottom);
-
-      arc_center_x = PlaceX + SquirlW + radius_small;
-      arc_center_y = PlaceBottom - radius_small;
-      cairoctx.arc ( (double)arc_center_x, (double)arc_center_y, radius_small, Math.PI/2.0, Math.PI);
-
-      cairoctx.line_to (PlaceX + SquirlW, MenuBottom + radius_small );
-
-      arc_center_x =  PlaceX + SquirlW - radius_small;
-      arc_center_y = MenuBottom + radius_small;
-      cairoctx.arc_negative ( (double)arc_center_x, (double)arc_center_y, radius_small, 0, 3.0*Math.PI/2.0);
-
-      cairoctx.line_to (PlaceX - Margin, MenuBottom);
-    }
-
-    public PlacesBackground ()
-    {
-      PlaceWidth = 0;
-    }
-
-    public void create_places_background (int WindowWidth,
-      int WindowHeight,
-      int TabPositionX,
-      int TabWidth,
-      int menu_width)
-    {
-      PlaceWidth = WindowWidth;
-      PlaceW = WindowWidth;
-      PlaceBottom = PlaceY + PlaceH;
-      MenuBottom = PlaceY + MenuH;
-
-      MenuW = menu_width;
-
-      if (this.get_child () is Clutter.Actor)
-      {
-        this.remove_actor (this.get_child ());
-      }
-
-      cairotxt = new Clutter.CairoTexture(PlaceW, PlaceH + Margin);
-      Cairo.Context cairoctx = cairotxt.create();
-      {
-        cairoctx.set_operator (Cairo.Operator.CLEAR);
-        cairoctx.paint ();
-        cairoctx.set_operator (Cairo.Operator.OVER);
-        cairoctx.translate (0.5f, 0.5f);
-
-        cairoctx.set_source_rgba (1, 1, 1, 1.0);
-        cairoctx.set_line_width (1.0);
-
-        cairoctx.move_to (PlaceX - Margin, PlaceY - Margin);
-        cairoctx.line_to (PlaceX + PlaceW + Margin, PlaceY - Margin);
-
-        DrawAroundMenu (cairoctx);
-
-        TabRect tab = TabRect();
-        tab.left = TabPositionX;
-        tab.right = tab.left + TabWidth;
-        tab.top = PlaceY + PlaceH - TabH;
-        tab.bottom = PlaceY + PlaceH;
-
-        DrawTab(cairoctx, tab);
-
-        DrawSquirl (cairoctx);
-
-        /* close the path */
-        cairoctx.line_to (PlaceX - Margin, PlaceY - Margin);
-
-        cairoctx.stroke_preserve ();
-
-        cairoctx.clip ();
-
-        Cairo.Surface surface = new Cairo.ImageSurface.from_png (Unity.PKGDATADIR + "/dash_background.png");
-        Cairo.Pattern pattern = new Cairo.Pattern.for_surface (surface);
-        pattern.set_extend (Cairo.Extend.REPEAT);
-        cairoctx.set_source (pattern);
-
-        cairoctx.paint_with_alpha (0.1);
-      }
-
-      cairotxt.set_opacity (0xFF);
-      this.add_actor (cairotxt);
-
-      /* Remove all effects set on this actor */
-      this.remove_all_effects ();
-
-      /* Create a new effect and add it to this actor */
-      /* The new effect will use the newly created drawing as a base */
-      effect_glow = new Ctk.EffectGlow ();
-      Clutter.Color c = Clutter.Color ()
-      {
-        red = 255,
-        green = 255,
-        blue = 255,
-        alpha = 255
-      };
-
-      effect_glow.set_color (c);
-      effect_glow.set_factor (1.0f);
-      effect_glow.set_margin (5);
-      this.add_effect (effect_glow);
-    }
-
-    construct
-    {
-    }
-  }
-
-
-  public class PlacesVSeparator : Ctk.Bin
-  {
-    public int Width = 0;
-    public int Height = 0;
-
-    public Clutter.CairoTexture cairotxt;
-    public PlacesVSeparator ()
-    {
-    }
-
-    public void CreateSeparator (int W, int H)
-    {
-      Width = W;
-      Height = H;
-
-      if (this.get_child () is Clutter.Actor)
-      {
-        this.remove_actor (this.get_child ());
-      }
-
-      cairotxt = new Clutter.CairoTexture(Width, Height);
-      Cairo.Context cairoctx = cairotxt.create();
-      {
-        cairoctx.set_source_rgba (1, 1, 1, 1.0);
-        cairoctx.set_line_width (1.0);
-
-        cairoctx.move_to (Width/2.0, 0);
-        cairoctx.line_to (Width/2.0, Height);
-
-        cairoctx.stroke ();
-        cairoctx.set_source_rgba (1, 1, 1, 0.15);
-      }
-
-      cairotxt.set_opacity (0xFF);
-      this.add_actor (cairotxt);
-
-      /* Remove all effects set on this actor */
-      this.remove_all_effects ();
-
-      /* Create a new effect and add it to this actor */
-      /* The new effect will use the newly created drawing as a base */
-      Ctk.EffectGlow effect_glow = new Ctk.EffectGlow ();
-      Clutter.Color c = Clutter.Color ()
-      {
-        red = 255,
-        green = 255,
-        blue = 255,
-        alpha = 255
-      };
-
-      effect_glow.set_color (c);
-      effect_glow.set_factor (1.0f);
-      effect_glow.set_margin (5);
-      this.add_effect (effect_glow);
-    }
-
-    construct
-    {
-    }
-  }
-
-  public class PlacesHSeparator : Ctk.Bin
-  {
-    public int Width = 0;
-    public int Height = 0;
-
-    public Clutter.CairoTexture cairotxt;
-    public PlacesHSeparator ()
-    {
-    }
-
-    public void CreateSeparator (int W, int H)
-    {
-      Width = W;
-      Height = H;
-
-      if (this.get_child () is Clutter.Actor)
-      {
-        this.remove_actor (this.get_child ());
-      }
-
-      cairotxt = new Clutter.CairoTexture(Width, Height);
-      Cairo.Context cairoctx = cairotxt.create();
-      {
-        cairoctx.set_source_rgba (1, 1, 1, 1.0);
-        cairoctx.set_line_width (1.0);
-
-        cairoctx.move_to (0, Height/2.0);
-        cairoctx.line_to (Width, Height/2.0);
-
-        cairoctx.stroke ();
-        cairoctx.set_source_rgba (1, 1, 1, 0.15);
-      }
-
-      cairotxt.set_opacity (0xFF);
-      this.add_actor (cairotxt);
-
-      /* Remove all effects set on this actor */
-      this.remove_all_effects ();
-
-      /* Create a new effect and add it to this actor */
-      /* The new effect will use the newly created drawing as a base */
-
-      Ctk.EffectGlow effect_glow = new Ctk.EffectGlow ();
-      Clutter.Color c = Clutter.Color ()
-      {
-        red = 255,
-        green = 255,
-        blue = 255,
-        alpha = 255
-      };
-
-      effect_glow.set_color (c);
-      effect_glow.set_factor (1.0f);
-      effect_glow.set_margin (5);
-      this.add_effect (effect_glow);
-    }
-
-    construct
-    {
-    }
-  }
-
-  public class RectangleBox : Ctk.Bin
-  {
-    public int Width = 0;
-    public int Height = 0;
-
-    public Clutter.CairoTexture cairotxt;
-    public RectangleBox ()
-    {
-    }
-
-    public void CreateRectangleBox (int W, int H)
-    {
-      Width = W;
-      Height = H;
-
-      if (this.get_child () is Clutter.Actor)
-      {
-        this.remove_actor (this.get_child ());
-      }
-
-      cairotxt = new Clutter.CairoTexture(Width, Height);
-      Cairo.Context cairoctx = cairotxt.create();
-      {
-        cairoctx.set_operator (Cairo.Operator.CLEAR);
-        cairoctx.paint ();
-        cairoctx.set_operator (Cairo.Operator.OVER);
-        cairoctx.translate (0.5f, 0.5f);
-
-        cairoctx.set_source_rgba (1, 1, 1, 1.0);
-        cairoctx.set_line_width (1.0);
-
-        cairoctx.move_to (1, 1);
-        cairoctx.line_to (Width-1, 1);
-        cairoctx.line_to (Width-1, Height-1);
-        cairoctx.line_to (1, Height-1);
-        cairoctx.line_to (1, 1);
-        cairoctx.stroke ();
-      }
-
-      cairotxt.set_opacity (0xFF);
-      this.add_actor (cairotxt);
-
-      /* Remove all effects set on this actor */
-      this.remove_all_effects ();
-
-      /* Create a new effect and add it to this actor */
-      /* The new effect will use the newly created drawing as a base */
-      Ctk.EffectGlow effect_glow = new Ctk.EffectGlow ();
-      Clutter.Color c = Clutter.Color ()
-      {
-        red = 255,
-        green = 255,
-        blue = 255,
-        alpha = 255
-      };
-
-      effect_glow.set_color (c);
-      effect_glow.set_factor (1.0f);
-      effect_glow.set_margin (5);
-      this.add_effect (effect_glow);
-    }
-
-    construct
-    {
-    }
-  }
-
-  public class EntryBackground : Ctk.Bin
-  {
-    public int Width = 0;
-    public int Height = 0;
-
-    public Clutter.CairoTexture cairotxt;
-    public EntryBackground ()
-    {
-      cairotxt = new Clutter.CairoTexture (120, 24);
-      add_actor (cairotxt);
-    }
-
-    public void create_search_entry_background (int W, int H)
-    {
-      Width = W;
-      Height = H;
-
-      Cairo.Context cairoctx = cairotxt.create();
-      {
-        cairoctx.set_operator (Cairo.Operator.CLEAR);
-        cairoctx.paint ();
-        cairoctx.set_operator (Cairo.Operator.OVER);
-        cairoctx.translate (-0.5f, -0.5f);
-
-        cairoctx.set_source_rgba (1.0, 1.0, 1.0, 0.9);
-        cairoctx.set_line_width (1.0);
-
-        cairoctx.move_to (10, 1);
-        cairoctx.line_to (Width-10, 1);
-
-        cairoctx.curve_to ((double)(Width-5), 1.0, (double)(Width-1), 5.0, (double)(Width-1), (double)(Height/2.0));
-        cairoctx.curve_to ((double)(Width-1), (double)(Height/2.0 + 5.0), (double)(Width-5), (double)(Height-2), (double)(Width-10), (double)(Height-2));
-
-        cairoctx.line_to (10, Height-2);
-
-        cairoctx.curve_to (5.0, (double)(Height-2), 1.0, (double)(Height/2.0 + 5.0), 1.0, (double)(Height/2.0));
-        cairoctx.curve_to (1.0, 5.0, 5.0, 1.0, 10.0, 1.0);
-
-
-        cairoctx.fill ();
-      }
-      cairotxt.set_opacity (0xFF);
-    }
-
-    /*private override void allocate (Clutter.ActorBox        box,
-                                    Clutter.AllocationFlags flags)
-    {
-      base.allocate (box, flags);
-      create_search_entry_background ((int)(box.x2 - box.x1), (int)(box.y2 - box.y1));
-    }*/
-
-    construct
-    {
-    }
-  }
-}
-

=== removed file 'unity-private/places/default-model.vala'
--- unity-private/places/default-model.vala	2009-12-14 14:14:37 +0000
+++ unity-private/places/default-model.vala	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Mirco "MacSlow" Müller <[e-mail]>
- *
- */
-
-using GLib;
-
-namespace Unity.Places.Default
-{
-  public class Model : Object
-  {
-    public string icon_name;
-    public string primary_text;
-    public string secondary_text;
-
-    public Model (string icon_name,
-                  string primary_text,
-                  string secondary_text)
-    {
-      this.icon_name      = icon_name;
-      this.primary_text   = primary_text;
-      this.secondary_text = secondary_text;
-    }
-
-    construct
-    {
-    }
-  }
-}

=== removed file 'unity-private/places/default-view.vala'
--- unity-private/places/default-view.vala	2010-01-07 23:43:48 +0000
+++ unity-private/places/default-view.vala	1970-01-01 00:00:00 +0000
@@ -1,203 +0,0 @@
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Mirco "MacSlow" Müller <[e-mail]>
- *
- */
-
-namespace Unity.Places.Default
-{
-  public class ActivityWidget : Ctk.Box
-  {
-    private Ctk.Image    icon;
-    private Clutter.Text primary_label;
-    private Clutter.Text secondary_label;
-
-    public ActivityWidget (int    spacing,
-                           int    size,
-                           string icon_name,
-                           string primary_text,
-                           string secondary_text)
-    {
-      string process_name = "activity_widget" + icon_name;
-      LOGGER_START_PROCESS (process_name);
-      Clutter.Color color = {255, 255, 255, 255};
-
-      this.homogeneous = false;
-      this.orientation = Ctk.Orientation.VERTICAL;
-      this.set_reactive (true);
-      //this.padding = pad;
-      this.spacing = spacing;
-      //this.width   = size + 32;
-      this.icon    = new Ctk.Image.from_stock (size, icon_name);
-      this.icon.set_reactive (true);
-
-      this.primary_label = new Clutter.Text ();
-      this.primary_label.set_reactive (true);
-      this.primary_label.width = size;
-      this.primary_label.set_markup (primary_text);
-      this.primary_label.justify = true;
-      this.primary_label.color = color;
-      this.primary_label.ellipsize = Pango.EllipsizeMode.NONE;
-      this.primary_label.line_wrap = true;
-      this.primary_label.line_alignment = Pango.Alignment.CENTER;
-
-      this.secondary_label = new Clutter.Text ();
-      this.secondary_label.set_reactive (true);
-      this.secondary_label.width = size + spacing;
-      //this.secondary_label.get_layout().set_height (-2);
-      this.secondary_label.text = secondary_text;
-      this.secondary_label.justify = false;
-      this.secondary_label.color = color;
-      //this.secondary_label.ellipsize = Pango.EllipsizeMode.END;
-      this.secondary_label.line_wrap = true;
-      this.secondary_label.line_alignment = Pango.Alignment.CENTER;
-      this.secondary_label.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-      this.enter_event.connect (this.on_enter);
-      this.leave_event.connect (this.on_leave);
-      this.secondary_label.opacity = 0;
-
-      this.pack (this.icon, false, false);
-      this.pack (this.primary_label, false, false);
-      this.pack (this.secondary_label, false, false);
-      LOGGER_END_PROCESS (process_name);
-    }
-
-    construct
-    {
-    }
-
-    public bool on_enter ()
-    {
-      this.secondary_label.opacity = 255;
-      return false;
-    }
-
-    public bool on_leave ()
-    {
-      this.secondary_label.opacity = 0;
-      return false;
-    }
-
-    public bool on_clicked ()
-    {
-      stdout.printf ("on_clicked() called\n");
-      return false;
-    }
-
-  }
-
-  public class View : Ctk.IconView
-  {
-    private Gee.ArrayList<Unity.Places.Default.Model> activities;
-
-    public override void allocate (Clutter.ActorBox box,
-                                   Clutter.AllocationFlags flags)
-    {
-      Ctk.Padding padding = { 0.0f, 0.0f, 0.0f, 0.0f };
-      float       real_width;
-      float       real_height;
-      float       min_height_p;
-      float       natural_height_p;
-      int         hor_spacing;
-
-      hor_spacing    = this.get_spacing ();
-      real_width     = box.x2 - box.x1;
-      real_height    = box.y2 - box.y1;
-      padding.left   = (real_width - 4*128 -3*hor_spacing) / 2.0f; /* HARDCODED: 4 colum matrix */
-      padding.right  = padding.left;
-
-      this.get_preferred_height (real_width,
-                                 out min_height_p,
-                                 out natural_height_p);
-
-      padding.top    = (real_height - 400) / 2.0f; /* HARDCODED */
-      padding.bottom = padding.top;
-
-      this.set_padding (padding);
-      base.allocate (box, flags);
-    }
-
-    public View ()
-    {
-      START_FUNCTION ();
-      Unity.Places.Default.Model activity;
-      int                        i;
-      ActivityWidget             widget;
-      int                        widget_size = 128; /* HARDCODED */
-
-      this.activities = new Gee.ArrayList<Unity.Places.Default.Model> ();
-
-      // populate defaultview with hard-coded contents for the moment
-      activity = new Unity.Places.Default.Model ("applications-internet",
-                                                 "<b>Web</b>",
-                                                 "Search, Suft & Download");
-      this.activities.add (activity);
-
-      activity = new Unity.Places.Default.Model ("rhythmbox",
-                                                 "<b>Music</b>",
-                                                 "Jukebox, Radio & Podcasts");
-      this.activities.add (activity);
-
-      activity = new Unity.Places.Default.Model ("applications-multimedia",
-                                                 "<b>Videos</b>",
-                                                 "YouTube & More");
-      this.activities.add (activity);
-
-      activity = new Unity.Places.Default.Model ("applications-graphics",
-                                                 "<b>Photos</b>",
-                                                 "Organize, Edit & Share");
-      this.activities.add (activity);
-
-      activity = new Unity.Places.Default.Model ("applications-office",
-                                                 "<b>Work</b>",
-                                                 "Office Documents, Spreadsheets & Presentations");
-      this.activities.add (activity);
-
-      activity = new Unity.Places.Default.Model ("evolution",
-                                                 "<b>Email</b>",
-                                                 "Read & Write Email");
-      this.activities.add (activity);
-
-      activity = new Unity.Places.Default.Model ("empathy",
-                                                 "<b>Chat</b>",
-                                                 "AIM, Yahoo, Skype & MSN");
-      this.activities.add (activity);
-
-      activity = new Unity.Places.Default.Model ("softwarecenter",
-                                                 "<b>Get New Apps</b>",
-                                                 "Ubuntu Software Center");
-      this.activities.add (activity);
-
-      // create image-actors now
-      for (i = 0; i < this.activities.size; i++)
-      {
-        widget = new ActivityWidget (0,
-                                     widget_size,
-                                     this.activities[i].icon_name,
-                                     this.activities[i].primary_text,
-                                     this.activities[i].secondary_text);
-        this.add_actor (widget);
-      }
-
-      this.show_all ();
-      END_FUNCTION ();
-    }
-
-    construct
-    {
-    }
-  }
-}

=== removed file 'unity-private/places/file-place.vala'
--- unity-private/places/file-place.vala	2010-01-20 17:57:50 +0000
+++ unity-private/places/file-place.vala	1970-01-01 00:00:00 +0000
@@ -1,239 +0,0 @@
-
-namespace Unity.Places.File
-{
-
-  const string FILES_FILE = Unity.PKGDATADIR + "/files.png";
-  const string FAVOURITES_ICON = Unity.PKGDATADIR + "/favourites.png";
-  const string MINIMIZE_ICON = Unity.PKGDATADIR + "/minimize_up.png";
-  const string MAXIMIZE_ICON = Unity.PKGDATADIR + "/maximize_up.png";
-
-  public class FileIcon
-  {
-    private Unity.Places.Bar.Model model;
-    public Ctk.Image view;
-    public Ctk.Text label;
-
-    public FileIcon (int width, /*int height,*/ string name, string icon_name, string tooltip)
-    {
-      model = new Unity.Places.Bar.Model (name, icon_name, tooltip);
-      view = new Ctk.Image.from_filename (width, icon_name);
-      view.set_reactive (true);
-      label = new Ctk.Text (name);
-    }
-  }
-
-  public class FileGroup : Ctk.Box
-  {
-    private Ctk.Text GroupName;
-    private Ctk.Image Star;
-    private Unity.Places.CairoDrawing.PlacesHSeparator Separator;
-    private Ctk.Image maximize_button;
-    private Ctk.Image minimize_button;
-    private bool is_open;
-    private Gee.ArrayList<FileIcon> file_icon_array;
-
-
-    public override void allocate (Clutter.ActorBox        box,
-                                   Clutter.AllocationFlags flags)
-    {
-      int IconWidth = 48;
-      int IconHeight = 48;
-      int FileIconSpacing = 100;
-
-      int HeaderBorderPositionX = 0;
-      int HeaderBorderPositionY = 60;
-      int IconBorderPositionX = 0;
-      int IconBorderPositionY = 100;
-      int LineBorderPositionX = 0;
-      int LineBorderPositionY = 90;
-
-      Clutter.ActorBox child_box = { 0.0f, 0.0f, 0.0f, 0.0f };
-
-      base.allocate (box, flags);
-
-      child_box.x1 = IconBorderPositionX;
-      child_box.x2 = 0;
-      child_box.y1 = IconBorderPositionY;
-      child_box.y2 = child_box.y1 + IconHeight;
-
-      int i;
-      for (i = 0; i < this.file_icon_array.size; i++)
-        {
-          child_box.x2 = child_box.x1 + IconWidth;
-          this.file_icon_array[i].view.allocate(child_box, flags);
-
-          Clutter.ActorBox label_box = { 0.0f, 0.0f, 0.0f, 0.0f };
-          label_box.x1 = child_box.x1;
-          label_box.x2 = child_box.x2;
-          label_box.y1 = IconBorderPositionY + IconHeight;
-          label_box.y2 = label_box.y1 + 64;
-          this.file_icon_array[i].label.allocate(label_box, flags);
-
-          child_box.x1 += IconWidth + FileIconSpacing;
-        }
-
-      if (this.Separator.Width != 800)
-        {
-          this.Separator.CreateSeparator ( 800, 5);
-        }
-      child_box.x1 = LineBorderPositionX;
-      child_box.x2 = child_box.x1 + 800;
-      child_box.y1 = LineBorderPositionY;
-      child_box.y2 = LineBorderPositionY + 5;
-      this.Separator.allocate (child_box, flags);
-
-      child_box.x1 = HeaderBorderPositionX;
-      child_box.x2 = child_box.x1 + 22;
-      child_box.y1 = HeaderBorderPositionY;
-      child_box.y2 = HeaderBorderPositionY+ 23;
-      this.Star.allocate (child_box, flags);
-
-      child_box.x1 = HeaderBorderPositionX + 22;
-      child_box.x2 = child_box.x1 + 100;
-      child_box.y1 = HeaderBorderPositionY;
-      child_box.y2 = HeaderBorderPositionY + 23;
-      this.GroupName.allocate (child_box, flags);
-
-      child_box.x1 += 750;
-      child_box.x2 = child_box.x1 + 16;
-      child_box.y1 = HeaderBorderPositionY;
-      child_box.y2 = HeaderBorderPositionY + 19;
-      this.maximize_button.allocate (child_box, flags);
-      this.minimize_button.allocate (child_box, flags);
-    }
-
-    public override void get_preferred_width (float for_height,
-                                              out float minimum_width,
-                                              out float natural_width)
-    {
-      minimum_width = 800.0f;
-      natural_width = 800.0f;
-    }
-
-    public override void get_preferred_height (float for_width,
-                                               out float minimum_height,
-                                               out float natural_height)
-    {
-      minimum_height = 150.0f;
-      natural_height = 150.0f;
-    }
-
-
-    public FileGroup (string group_name)
-    {
-      this.homogeneous  = false;
-      this.orientation  = Ctk.Orientation.HORIZONTAL;
-
-      this.GroupName = new Ctk.Text (group_name);
-      this.Star = new Ctk.Image.from_filename (23, FAVOURITES_ICON);
-      this.Separator = new Unity.Places.CairoDrawing.PlacesHSeparator ();
-      this.maximize_button = new Ctk.Image.from_filename (16, MAXIMIZE_ICON);
-      this.minimize_button = new Ctk.Image.from_filename (16, MINIMIZE_ICON);
-
-      file_icon_array = new Gee.ArrayList<FileIcon> ();
-      for (int i = 0; i < 5; i++)
-      {
-        FileIcon file = new FileIcon (48, "Files",
-                                      FILES_FILE,
-                                      "Your files stored locally");
-        this.file_icon_array.add (file);
-        this.add_actor (file.view);
-        this.add_actor (file.label);
-      }
-
-      this.add_actor (this.Star);
-      this.add_actor (this.Separator);
-      this.add_actor (this.GroupName);
-      this.add_actor (this.maximize_button);
-      this.add_actor (this.minimize_button);
-
-      this.is_open = true;
-      this.show_all ();
-
-      this.maximize_button.set_reactive (true);
-      this.minimize_button.set_reactive (true);
-      this.maximize_button.hide();
-      this.minimize_button.show();
-
-      this.maximize_button.button_release_event.connect (this.on_maximize);
-      this.minimize_button.button_release_event.connect (this.on_minimize);
-
-
-    }
-
-    construct
-    {
-    }
-
-    public bool on_minimize (Clutter.Event event)
-    {
-      this.maximize_button.show();
-      this.minimize_button.hide();
-      this.is_open = false;
-      return false;
-    }
-
-    public bool on_maximize (Clutter.Event event)
-    {
-      this.maximize_button.hide();
-      this.minimize_button.show();
-      this.is_open = true;
-      return false;
-    }
-  }
-
-  public class FileView : Ctk.Box
-  {
-    public FileGroup recent_file_group;
-    public FileGroup favourite_folder_group;
-    public FileGroup downloaded_file_group;
-    public override void allocate (Clutter.ActorBox        box,
-                                   Clutter.AllocationFlags flags)
-    {
-      Clutter.ActorBox child_box = { 0.0f, 0.0f, 0.0f, 0.0f };
-      float            width, height;
-      float            child_width, child_height;
-
-      base.allocate (box, flags);
-
-      width = box.x2 - box.x1;
-      height = box.y2 - box.y1;
-
-      this.recent_file_group.get_preferred_width (height,
-                                                  out child_width,
-                                                  out child_width);
-      this.recent_file_group.get_preferred_height (width,
-                                                   out child_height,
-                                                   out child_height);
-      child_box.x1 = (width - child_width)/2.0f;
-      child_box.x2 = child_box.x1 + child_width;
-      child_box.y1 = 0.0f;
-      child_box.y2 = child_height;
-      recent_file_group.allocate (child_box, flags);
-
-      child_box.y1 += child_height;
-      child_box.y2 = child_box.y1 + child_height;
-      favourite_folder_group.allocate (child_box, flags);
-
-      child_box.y1 += child_height;
-      child_box.y2 = child_box.y1 + child_height;
-      downloaded_file_group.allocate (child_box, flags);
-    }
-
-    public FileView ()
-    {
-      recent_file_group = new FileGroup ("Recent Files");
-      favourite_folder_group = new FileGroup ("Favourite Files");
-      downloaded_file_group = new FileGroup ("Downloaded Files");
-
-      this.add_actor (recent_file_group);
-      this.add_actor (favourite_folder_group);
-      this.add_actor (downloaded_file_group);
-      this.show_all ();
-    }
-
-    construct
-    {
-    }
-  }
-}

=== modified file 'unity-private/places/places-controller.vala'
--- unity-private/places/places-controller.vala	2010-04-27 12:04:34 +0000
+++ unity-private/places/places-controller.vala	2010-06-24 07:45:42 +0000
@@ -28,7 +28,6 @@
      * keeping it up-to-date
      **/
     public  Shell shell { get; construct; }
-    private Model model;
     private View view;
 
     public Controller (Shell shell)
@@ -38,126 +37,12 @@
 
     construct
     {
-      this.model = new Model ();
-      this.view = new View (this.model, this.shell);
-
-      Idle.add (this.load_places);
-    }
-
-    private bool load_places ()
-    {
-      var homeplace = new HomePlace ();
-      homeplace.activated.connect (this.on_place_activated);
-      this.model.add (homeplace);
-
-      this.load_remote_places ();
-
-      var place = new FakePlace ("Files & Folders", PKGDATADIR + "/files.png");
-      place.activated.connect (this.on_place_activated);
-      this.model.add (place);
-      
-      return false;
-    }
-
-    public void load_remote_places ()
-    {
-      string placesdir = PKGDATADIR + "/places";
-
-      var dir = GLib.File.new_for_path (placesdir);
-      try
-        {
-          var enumerator = dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
-                                                   0,
-                                                   null);
-          FileInfo file_info;
-          while ((file_info = enumerator.next_file (null)) != null)
-            {
-              var filename = placesdir + "/" + file_info.get_name ();
-              this.load_place (filename);
-            }
-        }
-      catch (Error error)
-        {
-          message (@"Unable to read places from $placesdir: %s", error.message);
-        }
-    }
-
-    private void load_place (string filename)
-    {
-      string group = "Place";
-
-      var file = new KeyFile ();
-
-      try
-        {
-          file.load_from_file (filename,
-                               KeyFileFlags.KEEP_COMMENTS
-                                | KeyFileFlags.KEEP_TRANSLATIONS);
-
-          var name = file.get_string (group, "Name");
-          var comment = file.get_string (group, "Comment");
-          var icon_name = file.get_string (group, "Icon");
-          var dbus_name = file.get_string (group, "DBusName");
-          var dbus_path = file.get_string (group, "DBusObjectPath");
-
-          Place place = new PlaceProxy (name,
-                                        icon_name,
-                                        comment,
-                                        dbus_name,
-                                        dbus_path);
-
-          if (place is Place)
-            {
-              place.activated.connect (this.on_place_activated);
-              this.model.add (place);
-            }
-        }
-      catch (Error e)
-        {
-          warning (@"Unable to load place '$filename': %s", e.message);
-        }
-    }
-
-    private void on_place_activated (Place place)
-    {
-      this.view.set_content_view (place.get_view ());
-    }
-
-    /* Public Methods */
+      view = new View (shell);
+    }
+
     public View get_view ()
     {
-      return this.view;
-    }
-  }
-
-  private class HomePlace : Place
-  {
-    public HomePlace ()
-    {
-      Object (name:"Home",
-              icon_name:PKGDATADIR + "/home.png",
-              comment:"");
-    }
-
-    public override Clutter.Actor get_view ()
-    {
-      return new Default.View ();
-    }
-  }
-
-  private class FakePlace : Place
-  {
-    public FakePlace (string name, string icon_name)
-    {
-      Object (name:name, icon_name:icon_name, comment:"");
-    }
-
-    public override Clutter.Actor get_view ()
-    {
-      if (this.name == "Applications")
-        return new Application.ApplicationView ();
-
-      return new File.FileView ();
+      return view;
     }
   }
 }

=== added file 'unity-private/places/places-default-renderer-group.vala'
--- unity-private/places/places-default-renderer-group.vala	1970-01-01 00:00:00 +0000
+++ unity-private/places/places-default-renderer-group.vala	2010-06-24 07:45:42 +0000
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+
+namespace Unity.Places
+{
+  public class DefaultRendererGroup : Ctk.Box
+  {
+    static const float PADDING = 0.0f;
+    static const int   SPACING = 0;
+
+    public uint      group_id       { get; construct; }
+    public string    group_renderer { get; construct; }
+    public string    display_name   { get; construct; }
+    public string    icon_hint      { get; construct; }
+    public Dee.Model results        { get; construct; }
+
+    private Ctk.HBox      title_box;
+    private Ctk.Image     icon;
+    private Ctk.Text      text;
+    private Ctk.Image     expander;
+    private Ctk.IconView  renderer;
+
+    public DefaultRendererGroup (uint      group_id,
+                                 string    group_renderer,
+                                 string    display_name,
+                                 string    icon_hint,
+                                 Dee.Model results)
+    {
+      Object (group_id:group_id,
+              group_renderer:group_renderer,
+              display_name:display_name,
+              icon_hint:icon_hint,
+              results:results);
+    }
+
+    construct
+    {
+      padding = { PADDING, PADDING, PADDING , PADDING};
+      orientation = Ctk.Orientation.VERTICAL;
+      spacing = SPACING;
+      homogeneous = false;
+      hide ();
+
+      title_box = new Ctk.HBox (12);
+      pack (title_box, false, true);
+      title_box.show ();
+
+      icon = new Ctk.Image (24);
+      //title_box.pack (icon, false, true);
+      icon.show ();
+
+      text = new Ctk.Text (display_name);
+      title_box.pack (text, true, true);
+      text.show ();
+
+      expander = new Ctk.Image (24);
+      //title_box.pack (expander, false, true);
+      expander.show ();
+
+      var sep = new Clutter.Rectangle.with_color ({ 255, 255, 255, 255 });
+      sep.set_height (1);
+      pack (sep, false, false);
+      sep.show ();
+
+      renderer = new Ctk.IconView ();
+      renderer.padding = { 12.0f, 0.0f, 0.0f, 0.0f };
+      //renderer.spacing = 30;
+      pack (renderer, true, true);
+      renderer.show ();
+
+      results.row_added.connect (on_result_added);
+      results.row_removed.connect (on_result_removed);
+    }
+
+    private override void get_preferred_height (float for_width,
+                                           out float min_height,
+                                           out float nat_height)
+    {
+      var children = renderer.get_children ();
+      if (children.length () > 0)
+        {
+          base.get_preferred_height (for_width, out min_height, out nat_height);
+          show ();
+        }
+      else
+        {
+          min_height = 0;
+          nat_height = 0;
+          hide ();
+        }
+    }
+
+    /*
+     * Private Methods
+     */
+    private void on_result_added (Dee.ModelIter iter)
+    {
+      if (!interesting (iter))
+        return;
+
+      var button = new Tile ();
+      button.set_label (results.get_string (iter, 4));
+      unowned Ctk.Text text = button.get_text ();
+      text.ellipsize = Pango.EllipsizeMode.END;
+      button.get_image ().set_from_stock ("text-x-preview");
+      renderer.add_actor (button);
+      button.show ();
+
+      button.set_data<unowned Dee.ModelIter> ("model-iter", iter);
+      button.set_data<string> ("uri", "%s".printf (results.get_string (iter, 0)));
+      button.clicked.connect ((b) => {
+        unowned string uri = b.get_data<unowned string> ("uri");
+
+        print (@"Launching $uri\n");
+        try {
+          Gtk.show_uri (Gdk.Screen.get_default (),
+                        uri,
+                        0);
+         } catch (GLib.Error e) {
+           warning ("Unable to launch: %s", e.message);
+         }
+      });
+
+      show ();
+    }
+
+    private void on_result_removed (Dee.ModelIter iter)
+    {
+      if (!interesting (iter))
+        return;
+
+      var children = renderer.get_children ();
+      foreach (Clutter.Actor actor in children)
+        {
+          unowned Dee.ModelIter i;
+
+          i = actor.get_data<unowned Dee.ModelIter> ("model-iter");
+          if (i == iter)
+            {
+              actor.destroy ();
+              break;
+            }
+        }
+
+      if (children.length () <= 1)
+        hide ();
+    }
+
+    private bool interesting (Dee.ModelIter iter)
+    {
+      return (results.get_uint (iter, 2) == group_id);
+    }
+  }
+
+  public class Tile : Ctk.Button
+  {
+    public Tile ()
+    {
+      Object (orientation:Ctk.Orientation.VERTICAL);
+    }
+
+    private override void get_preferred_width (float for_height,
+                                               out float mwidth,
+                                               out float nwidth)
+    {
+      mwidth = 160.0f;
+      nwidth = 160.0f;
+    }
+  }
+}
+

=== added file 'unity-private/places/places-default-renderer.vala'
--- unity-private/places/places-default-renderer.vala	1970-01-01 00:00:00 +0000
+++ unity-private/places/places-default-renderer.vala	2010-06-24 07:45:42 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+
+namespace Unity.Places
+{
+  public class DefaultRenderer : Ctk.ScrollView, Unity.Place.Renderer
+  {
+    static const float PADDING = 12.0f;
+    static const int   SPACING = 12;
+
+    private Ctk.VBox box;
+    private Dee.Model groups_model;
+    private Dee.Model results_model;
+
+    public DefaultRenderer ()
+    {
+      Object ();
+    }
+
+    construct
+    {
+      padding = { 0.0f, 0.0f, PADDING, 0.0f };
+      box = new Ctk.VBox (SPACING);
+      box.padding = { PADDING, PADDING, PADDING , PADDING};
+      box.homogeneous = false;
+      add_actor (box);
+      box.show ();
+    }
+
+    /*
+     * Private Methods
+     */
+    public void set_models (Dee.Model                   groups,
+                            Dee.Model                   results,
+                            Gee.HashMap<string, string> hints)
+    {
+      groups_model = groups;
+      results_model = results;
+
+      groups_model.row_added.connect (on_group_added);
+      groups_model.row_removed.connect (on_group_removed);
+    }
+
+    private void on_group_added (Dee.Model model, Dee.ModelIter iter)
+    {
+      var group = new DefaultRendererGroup (model.get_position (iter),
+                                            model.get_string (iter, 0),
+                                            model.get_string (iter, 1),
+                                            model.get_string (iter, 2),
+                                            results_model);
+      group.set_data<unowned Dee.ModelIter> ("model-iter", iter);
+      box.pack (group, false, true);
+    }
+
+    private void on_group_removed (Dee.Model model, Dee.ModelIter iter)
+    {
+      GLib.List<Clutter.Actor> children = box.get_children ();
+      foreach (Clutter.Actor actor in children)
+        {
+          unowned Dee.ModelIter i = (Dee.ModelIter)actor.get_data<Dee.ModelIter> ("model-iter");
+          if (i == iter)
+            {
+              actor.destroy ();
+              break;
+            }
+        }
+    }
+  }
+}
+

=== removed file 'unity-private/places/places-model.vala'
--- unity-private/places/places-model.vala	2010-01-19 16:10:14 +0000
+++ unity-private/places/places-model.vala	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-
-using Gee;
-
-namespace Unity.Places
-{
-  public class Model : Object
-  {
-    /**
-     * Contains a list of places
-     **/
-
-    /* Properties */
-    public ArrayList<Place> list;
-
-    /* Signals */
-    public signal void place_added (Place place);
-    public signal void place_removed (Place place);
-    public signal void place_changed (Place place);
-
-    public Model ()
-    {
-      Object ();
-    }
-
-    construct
-    {
-      list = new ArrayList<Place> ();
-    }
-
-    public void add (Place place)
-    {
-      this.list.add (place);
-
-      this.place_added (place);
-    }
-
-    public void remove (Place place)
-    {
-      this.list.remove (place);
-
-      this.place_removed (place);
-    }
-
-  }
-}
-

=== added file 'unity-private/places/places-place-bar.vala'
--- unity-private/places/places-place-bar.vala	1970-01-01 00:00:00 +0000
+++ unity-private/places/places-place-bar.vala	2010-06-24 07:45:42 +0000
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+
+namespace Unity.Places
+{
+  public class PlaceBar : Ctk.Box
+  {
+    /* Properties */
+    public Shell      shell { get; construct; }
+    public PlaceModel model { get; set construct; }
+
+    private PlaceBarBackground bg;
+    private Ctk.EffectGlow     glow;
+    private PlaceEntryView     active_view = null;
+
+    public signal void entry_view_activated (PlaceEntryView view, int x);
+
+    public PlaceBar (Shell shell, PlaceModel model)
+    {
+      Object (shell:shell,
+              model:model,
+              orientation:Ctk.Orientation.HORIZONTAL,
+              homogeneous:false,
+              spacing:0);
+    }
+
+    construct
+    {
+      bg = new PlaceBarBackground (shell);
+      set_background (bg);
+      bg.show ();
+
+      /* Enable once clutk bug is fixed */
+      glow = new Ctk.EffectGlow ();
+      glow.set_color ({ 255, 255, 255, 255 });
+      glow.set_factor (1.0f);
+      glow.set_margin (5);
+      add_effect (glow);
+
+      foreach (Place place in model)
+        {
+          var view = new PlaceView (place);
+          pack (view, false, true);
+          view.show ();
+
+          view.entry_activated.connect (on_entry_activated);
+        }
+      model.place_added.connect ((p) => {
+        var view = new PlaceView (p);
+        pack (view, false, true);
+        view.show ();
+
+        view.entry_activated.connect (on_entry_activated);
+      });
+    }
+
+    private override void allocate (Clutter.ActorBox        box,
+                                    Clutter.AllocationFlags flags)
+    {
+      padding = {
+        0.0f,
+        (float)shell.get_indicators_width (),
+        0.0f,
+        (float)shell.get_launcher_width_foobar ()};
+
+      base.allocate (box, flags);
+    }
+
+    private override void get_preferred_height (float     for_width,
+                                                out float min_height,
+                                                out float nat_height)
+    {
+      min_height = 56.0f;
+      nat_height = 56.0f;
+    }
+
+    private void on_entry_activated (PlaceView view, PlaceEntryView entry_view)
+    {
+      if (active_view == entry_view)
+        return;
+
+      if (active_view is PlaceEntryView)
+        {
+          active_view.entry.active = false;
+        }
+
+        active_view = entry_view;
+        active_view.entry.active = true;
+        bg.entry_position = (int)(view.x + entry_view.x);
+
+        glow.set_invalidate_effect_cache (true);
+
+        entry_view_activated (entry_view,
+                              bg.entry_position + (PlaceEntryView.WIDTH/2));
+    }
+  }
+
+  public class PlaceBarBackground : Clutter.CairoTexture
+  {
+    public const string BG = "/usr/share/unity/dash_background.png";
+
+    public Shell shell { get; construct; }
+
+    private int last_width = 0;
+    private int last_height = 0;
+
+    Gdk.Pixbuf tile = null;
+
+    private int _entry_position = 0;
+    public int entry_position {
+      get { return _entry_position; }
+      set {
+        if (_entry_position != value)
+          {
+            _entry_position = value;
+            update_background ();
+          }
+      }
+    }
+
+    public PlaceBarBackground (Shell shell)
+    {
+      Object (shell:shell);
+    }
+
+    construct
+    {
+      try
+        {
+          /* I've loaded this in directly and not through theme due to use
+           * not having a good loader for pixbufs from the theme right now
+           */
+          tile = new Gdk.Pixbuf.from_file (BG);
+        }
+      catch (Error e)
+        {
+          warning ("Unable to load dash background");
+        }
+    }
+
+    private override void allocate (Clutter.ActorBox        box,
+                                    Clutter.AllocationFlags flags)
+    {
+      int width = (int)(box.x2 - box.x1);
+      int height = (int)(box.y2 - box.y1);
+
+      base.allocate (box, flags);
+
+      if (width != last_width || height != last_height)
+        {
+          last_width = width;
+          last_height = height;
+
+          Timeout.add (0, update_background);
+        }
+    }
+
+    private bool update_background ()
+    {
+      Cairo.Context cr;
+
+      set_surface_size (last_width, last_height);
+
+      cr = create ();
+
+      cr.set_operator (Cairo.Operator.CLEAR);
+      cr.paint ();
+
+      cr.set_operator (Cairo.Operator.OVER);
+      cr.set_line_width (1.5);
+      cr.set_source_rgba (1.0, 1.0, 1.0, 0.0);
+
+      cr.translate (-0.5, -0.5);
+
+      /* Basic variables */
+      var x = -1;
+      var y = -1;
+      var width = last_width + 2;
+      var height = last_height;
+      var radius = 13;
+      var launcher_width = shell.get_launcher_width_foobar ();
+      var panel_height = shell.get_panel_height_foobar ();
+      var entry_width = PlaceEntryView.WIDTH;
+      var top_padding = 3;
+
+      /* Draw the top outline */
+      cr.move_to (x, y);
+      cr.line_to (width, y);
+      cr.line_to (width, height);
+
+      if (entry_position != 0)
+        {
+          /* This is when we have an active place entry */
+          var x1 = entry_position;
+          var x2 = entry_position + entry_width;
+
+          cr.line_to  (x2 + radius, height);
+          cr.curve_to (x2, height,
+                       x2, height,
+                       x2, height - radius);
+          cr.line_to  (x2, radius + top_padding);
+          cr.curve_to (x2, top_padding,
+                       x2, top_padding,
+                       x2 - radius, top_padding);
+          cr.line_to  (x1 + radius, top_padding);
+          cr.curve_to (x1, top_padding,
+                       x1, top_padding,
+                       x1, top_padding + radius);
+
+          if (x1 < launcher_width + entry_width) /* first entry */
+            {
+              cr.line_to (launcher_width, panel_height);
+            }
+          else
+            {
+              cr.line_to  (x1, height - radius);
+              cr.curve_to (x1, height,
+                           x1, height,
+                           x1-radius, height);
+              cr.line_to  (launcher_width + radius, height);
+              cr.curve_to (launcher_width, height,
+                           launcher_width, height,
+                           launcher_width, height - radius);
+              cr.line_to  (launcher_width, panel_height);
+            }
+        }
+      else
+        {
+          cr.line_to  (launcher_width + radius, height);
+          cr.curve_to (launcher_width, height,
+                       launcher_width, height,
+                       launcher_width, height - radius);
+          cr.line_to  (launcher_width, panel_height);
+        }
+
+      cr.line_to (x, panel_height);
+      cr.close_path ();
+
+      cr.stroke_preserve ();
+      cr.clip_preserve ();
+
+      /* Tile the background */
+      if (tile is Gdk.Pixbuf)
+        {
+          Gdk.cairo_set_source_pixbuf (cr, tile, 0, 0);
+          var pat = cr.get_source ();
+          pat.set_extend (Cairo.Extend.REPEAT);
+          cr.paint_with_alpha (0.25);
+        }
+
+      /* Add the outline */
+      cr.reset_clip ();
+      cr.set_source_rgba (1.0, 1.0, 1.0, 0.6);
+      cr.stroke ();
+
+      return false;
+    }
+  }
+}
+

=== added file 'unity-private/places/places-place-entry-view.vala'
--- unity-private/places/places-place-entry-view.vala	1970-01-01 00:00:00 +0000
+++ unity-private/places/places-place-entry-view.vala	2010-06-24 07:45:42 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+
+namespace Unity.Places
+{
+  public class PlaceEntryView : Ctk.Image
+  {
+    static const int WIDTH = 80;
+
+    /* Properties */
+    public PlaceEntry entry { get; construct; }
+
+    public PlaceEntryView (PlaceEntry entry)
+    {
+      Object (entry:entry,
+              size:48,
+              reactive:true);
+
+      set_from_filename (entry.icon);
+    }
+
+    construct
+    {
+    }
+
+    private override void get_preferred_width (float     for_height,
+                                               out float min_width,
+                                               out float nat_width)
+    {
+      min_width = (float) WIDTH;
+      nat_width = (float) WIDTH;
+    }
+  }
+}
+

=== added file 'unity-private/places/places-place-entry.vala'
--- unity-private/places/places-place-entry.vala	1970-01-01 00:00:00 +0000
+++ unity-private/places/places-place-entry.vala	2010-06-24 07:45:42 +0000
@@ -0,0 +1,408 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+
+namespace Unity.Places
+{
+  /**
+   * Represents a PlaceEntry through a .place file ("offline") and then through
+   * DBus ("online").
+   **/
+  public class PlaceEntry : Object
+  {
+    /* FIXME: Use what's in libunity. We only need this so vala allows us to
+     * connect to the signal
+     */
+    public struct RendererInfo
+    {
+      string default_renderer;
+      string groups_model;
+      string results_model;
+      HashTable<string, string> renderer_hints;
+    }
+
+    /*
+     * Properties
+     */
+    public string? dbus_name   { get; construct; }
+    public string? dbus_path   { get; construct; }
+    public string  name        { get; construct set; }
+    public string  icon        { get; construct set; }
+    public string  description { get; construct set; }
+
+    public uint     position  { get; set; }
+    public string[] mimetypes { get; set; }
+    public bool     sensitive { get; set; }
+
+    public Gee.HashMap<string, string> hints { get; set; }
+
+    /* Whether the Entry is available on the bus, this is only when we want to
+     * do optimisations for startup (showing the entries before actually
+     * starting the daemon. We can also abuse this for testing :)
+     */
+    public bool   online    { get; construct set; }
+
+    /* This is loaded from the desktop file, isn't useful when the entry
+     * is online
+     */
+    public bool    show_global { get; construct set; }
+    public bool    show_entry  { get; construct set; }
+
+    /* This is relayed to the service, in case it needs to do something special
+     * when it's activated
+     */
+    private bool _active = false;
+    public bool active {
+      get { return _active; }
+      set {
+        if (_active != value)
+          {
+            _active = value;
+            service.set_active (_active);
+          }
+      }
+    }
+
+    /* We store the name of the sections model, and we provide the actual
+     * model too. The reason for this is that for testing, we can easily inject
+     * a fake model into a fake entry and test the views. It also keeps things
+     * cleaner for the views (they aren't creating their own models).
+     */
+    public string      sections_model_name { get; set; }
+    private Dee.Model? _sections_model = null;
+    public Dee.Model?  sections_model {
+      get {
+        if (_sections_model is Dee.Model == false)
+          {
+            if (sections_model_name != null)
+              {
+                _sections_model = new Dee.SharedModel.with_name (sections_model_name);
+                (_sections_model as Dee.SharedModel).connect ();
+              }
+          }
+        return _sections_model;
+      }
+      set {
+        _sections_model = value;
+      }
+    }
+
+    /* Entry rendering info */
+    public string entry_renderer_name;
+
+    public string      entry_groups_model_name;
+    private Dee.Model? _entry_groups_model;
+    public Dee.Model?  entry_groups_model {
+      get {
+        if (_entry_groups_model is Dee.Model == false)
+          {
+            if (entry_groups_model_name != null)
+              {
+                _entry_groups_model = new Dee.SharedModel.with_name (entry_groups_model_name);
+                (_entry_groups_model as Dee.SharedModel).connect ();
+              }
+          }
+        return _entry_groups_model;
+      }
+      set {
+          _entry_groups_model = value;
+      }
+    }
+
+    public string      entry_results_model_name;
+    private Dee.Model? _entry_results_model;
+    public Dee.Model?  entry_results_model {
+      get {
+        if (_entry_results_model is Dee.Model == false)
+          {
+            if (entry_results_model_name != null)
+              {
+                _entry_results_model = new Dee.SharedModel.with_name (entry_results_model_name);
+                (_entry_results_model as Dee.SharedModel).connect ();
+              }
+          }
+        return _entry_results_model;
+      }
+      set {
+          _entry_results_model = value;
+      }
+    }
+
+    public Gee.HashMap<string, string>? entry_renderer_hints;
+
+    /* Global rendering info */
+    public string global_renderer_name;
+
+    public string      global_groups_model_name;
+    private Dee.Model? _global_groups_model;
+    public Dee.Model?  global_groups_model {
+      get {
+        if (_global_groups_model is Dee.Model == false)
+          {
+            if (global_groups_model_name != null)
+              {
+                _global_groups_model = new Dee.SharedModel.with_name (global_groups_model_name);
+                (_global_groups_model as Dee.SharedModel).connect ();
+              }
+          }
+        return _global_groups_model;
+      }
+      set {
+          _global_groups_model = value;
+      }
+    }
+
+    public string      global_results_model_name;
+    private Dee.Model? _global_results_model;
+    public Dee.Model?  global_results_model {
+      get {
+        if (_global_results_model is Dee.Model == false)
+          {
+            if (global_results_model_name != null)
+              {
+                _global_results_model = new Dee.SharedModel.with_name (global_results_model_name);
+                (_global_results_model as Dee.SharedModel).connect ();
+              }
+          }
+        return _global_results_model;
+      }
+      set {
+          _global_results_model = value;
+      }
+    }
+
+    public Gee.HashMap<string, string>? global_renderer_hints;
+
+    /* Our connection to the place-entry over dbus */
+    private DBus.Connection?     connection;
+    private dynamic DBus.Object? service;
+
+    /*
+     * Signals
+     */
+    public signal void updated ();
+    public signal void renderer_info_changed ();
+
+    /*
+     * Constructors
+     */
+    public PlaceEntry (string dbus_name, string dbus_path)
+    {
+      Object (dbus_name:dbus_name, dbus_path:dbus_path);
+    }
+
+    public PlaceEntry.with_info (string dbus_name,
+                                 string dbus_path,
+                                 string name,
+                                 string icon,
+                                 string description,
+                                 bool   show_global,
+                                 bool   show_entry)
+    {
+      Object (dbus_name:dbus_name,
+              dbus_path:dbus_path,
+              name:name,
+              icon:icon,
+              description:description,
+              show_global:show_global,
+              show_entry:show_entry);
+    }
+
+    construct
+    {
+      online = false;
+    }
+
+    /*
+     * Public Methods
+     */
+    public void update_info (GLib.ValueArray value_array)
+                             requires (value_array.n_values == 10)
+    {
+      /* Un-marshal the array and update our information */
+      name = value_array.get_nth (1).get_string ();
+      icon = value_array.get_nth (2).get_string ();
+      position = value_array.get_nth (3).get_uint ();
+
+      /* FIXME: Unmarshall string[] mimetypes */
+
+      sensitive = value_array.get_nth (5).get_boolean ();
+      sections_model_name = value_array.get_nth (6).get_string ();
+
+      HashTable<string, string> hash = (HashTable<string, string>)(value_array.get_nth (7).get_boxed ());
+      if (hints != null)
+        hints = map_from_hash (hash);
+      else
+        hints = null;
+
+      /* Unmarshal the Entry RenderInfo */
+      unowned ValueArray ea = (ValueArray)(value_array.get_nth (8).get_boxed ());
+      if (ea != null)
+        {
+          entry_renderer_name = ea.get_nth (0).get_string ();
+
+          var str = ea.get_nth (1).get_string ();
+          if (entry_groups_model_name != str)
+            {
+              entry_groups_model_name = str;
+              entry_groups_model = null;
+            }
+
+          str = ea.get_nth (2).get_string ();
+          if (entry_results_model_name != str)
+            {
+              entry_results_model_name = str;
+              entry_results_model = null;
+            }
+
+          hash = (HashTable<string, string>)(ea.get_nth (3).get_boxed ());
+          if (hash != null)
+            entry_renderer_hints = map_from_hash (hash);
+          else
+            entry_renderer_hints = null;
+        }
+
+      /* Unmarshal the Global RenderInfo */
+      unowned ValueArray ga = (ValueArray)(value_array.get_nth (9).get_boxed ());
+      if (ga != null)
+        {
+          global_renderer_name = ga.get_nth (0).get_string ();
+
+          var str = ga.get_nth (1).get_string ();
+          if (global_groups_model_name != str)
+            {
+              global_groups_model_name = str;
+              global_groups_model = null;
+            }
+
+          str = ga.get_nth (2).get_string ();
+          if (global_results_model_name != str)
+            {
+              global_results_model_name = str;
+              global_results_model = null;
+            }
+
+          hash = (HashTable<string, string>)(ga.get_nth (3).get_boxed ());
+          if (hash != null)
+            global_renderer_hints = map_from_hash (hash);
+          else
+            global_renderer_hints = null;
+        }
+
+      updated ();
+      renderer_info_changed ();
+    }
+
+    public new void connect ()
+    {
+      if (online == true)
+        return;
+
+      /* Grab the entry off DBus */
+      try {
+        connection = DBus.Bus.get (DBus.BusType.SESSION);
+        service = connection.get_object (dbus_name,
+                                         dbus_path,
+                                         "com.canonical.Unity.PlaceEntry");
+      } catch (Error e) {
+        warning (@"Unable to connect to $dbus_path on $dbus_name: %s",
+                 e.message);
+        return;
+      }
+
+      service.RendererInfoChanged.connect (on_renderer_info_changed);
+
+      online = true;
+    }
+
+    public void set_search (string search, HashTable<string, string> hints)
+    {
+      uint id;
+
+      id = service.set_search (search, hints);
+    }
+
+    public void set_active_section (uint section_id)
+    {
+      service.set_active_section (section_id);
+    }
+
+    public void set_global_search (string                    search,
+                                   HashTable<string, string> hints)
+    {
+      service.set_global_search (search, hints);
+    }
+
+    /*
+     * Private Methods
+     */
+
+    private void on_renderer_info_changed (dynamic DBus.Object dbus_object,
+                                           RendererInfo        info)
+    {
+      RendererInfo *i = &info;
+      unowned ValueArray ea = (ValueArray)i;
+
+      if (ea != null)
+        {
+          entry_renderer_name = ea.get_nth (0).get_string ();
+
+          var str = ea.get_nth (1).get_string ();
+          if (entry_groups_model_name != str)
+            {
+              entry_groups_model_name = str;
+              entry_groups_model = null;
+            }
+
+          str = ea.get_nth (2).get_string ();
+          if (entry_results_model_name != str)
+            {
+              entry_results_model_name = str;
+              entry_results_model = null;
+            }
+
+          HashTable<string, string>hash = (HashTable<string, string>)(ea.get_nth (3).get_boxed ());
+          if (hash != null)
+            entry_renderer_hints = map_from_hash (hash);
+          else
+            entry_renderer_hints = null;
+
+          updated ();
+          renderer_info_changed ();
+        }
+    }
+
+    private Gee.HashMap<string, string> map_from_hash (HashTable<string, string>hash)
+    {
+      Gee.HashMap<string, string> map = new Gee.HashMap<string, string> ();
+
+      HashTableIter<string, string> iter = HashTableIter<string, string> (hash);
+      unowned void* key, val;
+      while (iter.next (out key, out val))
+        {
+          unowned string k = (string)key;
+          unowned string v = (string)val;
+
+          map[k] = v;
+        }
+
+      return map;
+    }
+  }
+}
+

=== added file 'unity-private/places/places-place-model.vala'
--- unity-private/places/places-place-model.vala	1970-01-01 00:00:00 +0000
+++ unity-private/places/places-place-model.vala	2010-06-24 07:45:42 +0000
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+
+namespace Unity.Places
+{
+  /**
+   * PlaceModel:
+   *
+   * Contains the loaded Place objects. Abstract class so views can be
+   * tested with fake model
+   **/
+  public abstract class PlaceModel : Gee.ArrayList<Place>
+  {
+    public signal void place_added (Place place);
+  }
+
+
+  /**
+   * PlaceFileModel:
+   *
+   * Reads in .place files and creates the offline model, ready for representing
+   * to the user without actually initing any of the places
+   **/
+  public class PlaceFileModel : PlaceModel
+  {
+    /* Properties */
+    public string directory { get; construct; }
+    public bool   async     { get; construct; }
+
+    /* Constructors */
+    public PlaceFileModel ()
+    {
+      Object (directory:PKGDATADIR + "/places", async:true);
+    }
+
+    /* Allows loading places files from a non-install directory */
+    public PlaceFileModel.with_directory (string _directory)
+    {
+      Object (directory: _directory, async:false);
+    }
+
+    construct
+    {
+      /* Start asyncly reading in place files */
+      if (async)
+        load_place_files.begin ();
+      else
+        load_place_files_sync ();
+    }
+
+    /* Private Methods */
+
+    /*
+     * Read in all the .place files from the directory and convert them to
+     * Place objects, with the initial set of Entries, if that information
+     * was included inside the .place file
+     */
+    private async void load_place_files ()
+    {
+      var dir = File.new_for_path (directory);
+      try {
+        var e = yield dir.enumerate_children_async (FILE_ATTRIBUTE_STANDARD_NAME,
+                                                  0,
+                                                  Priority.DEFAULT, null);
+        while (true)
+          {
+            var files = yield e.next_files_async (10, Priority.DEFAULT, null);
+            if (files == null)
+              break;
+
+            foreach (var info in files)
+              {
+                if (info.get_name ().has_suffix (".place") == false)
+                  continue;
+
+                /* FIXME: load_place needs to be async */
+                var place = load_place (Path.build_filename (directory,
+                                                             info.get_name ()));
+                if (place is Place)
+                  {
+                    place.connect ();
+                    (place as GLib.Object).ref ();
+                    add (place);
+                    place_added (place);
+                  }
+              }
+          }
+
+      } catch (Error error) {
+        warning (@"Unable to read place files from directory '$directory': %s",
+                 error.message);
+      }
+    }
+
+    private void load_place_files_sync ()
+    {
+      var dir = File.new_for_path (directory);
+      try {
+          var e = dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, 0, null);
+          FileInfo info;
+          while ((info = e.next_file (null)) != null)
+            {
+              string leaf = info.get_name ();
+              if (leaf.has_suffix (".place") == false)
+                continue;
+
+              var place = load_place (Path.build_filename (directory, leaf));
+              if (place is Place)
+                {
+                  add (place);
+                  place_added (place);
+                }
+            }
+
+      } catch (Error error) {
+        warning (@"Unable to read place files from directory '$directory': %s",
+                 error.message);
+      }
+    }
+
+    /*
+     * Reads in the place file (which is a key file) and creates and inits
+     * a UnityPlacesPlace object to represent it.
+     */
+    private Place? load_place (string path)
+    {
+      var file = new KeyFile ();
+      try {
+        file.load_from_file (path, KeyFileFlags.NONE);
+
+        return Place.new_from_keyfile (file, path);
+
+      } catch (Error e) {
+        warning (@"Unable to load place file '$path': %s", e.message);
+        return null;
+      }
+    }
+  }
+}

=== removed file 'unity-private/places/places-place-proxy.vala'
--- unity-private/places/places-place-proxy.vala	2010-04-28 12:19:01 +0000
+++ unity-private/places/places-place-proxy.vala	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-
-namespace Unity.Places
-{
-  public class PlaceProxy : Place
-  {
-    /**
-     * Represents a Remote Place (icon, view etc).
-     **/
-
-    /* Properties */
-    public string dbus_name { get; construct; }
-    public string dbus_path { get; construct; }
-
-    private DBus.Connection?     conn;
-    private dynamic DBus.Object? service;
-
-    private Ctk.Box view;
-
-    public PlaceProxy (string name,
-                       string icon_name,
-                       string comment,
-                       string dbus_name,
-                       string dbus_path)
-    {
-      Object (name:name,
-              icon_name:PKGDATADIR + "/applications.png",
-              comment:comment,
-              dbus_name:dbus_name,
-              dbus_path:dbus_path);
-    }
-
-    construct
-    {
-
-    }
-
-    private void setup_service ()
-    {
-      try
-        {
-          // FIXME: Sync dbus calls all over the place!
-          this.conn = DBus.Bus.get (DBus.BusType.SESSION);
-          this.service = conn.get_object (this.dbus_name,
-                                          this.dbus_path,
-                                          "com.canonical.Unity.Place");
-
-          this.service.ViewChanged += this.on_view_changed;
-
-          this.service.set_active (false);
-        }
-      catch (Error e)
-        {
-          warning ("Unable to start service %s: %s",
-                   this.dbus_name,
-                   e.message);
-        }
-    }
-
-    private void on_view_changed (dynamic DBus.Object       s,
-                                  HashTable<string, string> view_properties)
-    {
-      /**
-       * This is just to get something working, in the future they'll be a
-       * view_loader class that handles loading internal and extenal views
-       * (from models), and doing the string => GType conversion. Views just
-       * need to implement PlaceView interface
-       **/
-      var view_name = view_properties.lookup ("view-name");
-
-      debug (@"View changed: $view_name");
-      if (view_name == "ResultsView")
-        {
-          var new_view = new Views.ResultsView ();
-          new_view.init_with_properties (view_properties);
-
-          this.view.add_actor (new_view);
-        }
-      else
-        {
-          warning (@"Unknown view: $view_name");
-        }
-    }
-
-    public override Clutter.Actor get_view ()
-    {
-      /* Dump this in here for the moment */
-      if (!(this.service is DBus.Object))
-        {
-          this.setup_service ();
-        }
-
-      if (!(this.view is Ctk.Box))
-        {
-          this.view = new Ctk.VBox (0);
-        }
-
-      return this.view;
-    }
-  }
-}
-

=== added file 'unity-private/places/places-place-search-bar.vala'
--- unity-private/places/places-place-search-bar.vala	1970-01-01 00:00:00 +0000
+++ unity-private/places/places-place-search-bar.vala	2010-06-24 07:45:42 +0000
@@ -0,0 +1,299 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+
+namespace Unity.Places
+{
+  public class PlaceSearchBar : Ctk.Box
+  {
+    static const int SPACING = 10;
+    static const int RANDOM_TEXT_WIDTH = 400;
+
+    /* Properties */
+    private PlaceEntry? active_entry = null;
+
+    private PlaceSearchBarBackground bg;
+
+    private PlaceSearchEntry       entry;
+    private PlaceSearchSectionsBar sections;
+
+    public PlaceSearchBar ()
+    {
+      Object (orientation:Ctk.Orientation.HORIZONTAL,
+              homogeneous:false,
+              spacing:8);
+    }
+
+    construct
+    {
+      padding = {
+        SPACING * 2.0f,
+        SPACING * 1.0f,
+        SPACING * 1.0f,
+        SPACING * 1.0f
+      };
+
+      entry = new PlaceSearchEntry ();
+      pack (entry, true, true);
+      entry.show ();
+      entry.text_changed.connect (on_search_text_changed);
+
+      sections = new PlaceSearchSectionsBar ();
+      pack (sections, false, true);
+      entry.show ();
+
+      bg = new PlaceSearchBarBackground (entry);
+      set_background (bg);
+      bg.show ();
+    }
+
+    private override void allocate (Clutter.ActorBox        box,
+                                    Clutter.AllocationFlags flags)
+    {
+      float ex = entry.x;
+      float ewidth = entry.width;
+
+      base.allocate (box, flags);
+
+      if (entry.x != ex || entry.width != ewidth)
+        {
+          /* After discussion with upstream Clutter guys, it seems like the
+           * warning when resizing a CairoTexture is a bug in Clutter, however
+           * the fix is not trivial, so it was suggested to use a 0-sec timeout.
+           * We don't use an idle as it seems to have a lower priority and the
+           * user will see a jump between states, the 0-sec timeout seems to be
+           * dealt with immediately in the text iteration.
+           */
+          Timeout.add (0, bg.update_background);
+        }
+    }
+
+    private override void get_preferred_height (float     for_width,
+                                                out float min_height,
+                                                out float nat_height)
+    {
+      float mheight, nheight;
+
+      entry.get_preferred_height (RANDOM_TEXT_WIDTH, out mheight, out nheight);
+      min_height = mheight + SPACING * 3;
+      nat_height = nheight + SPACING * 3;
+    }
+
+    private void on_search_text_changed (string text)
+    {
+      if (active_entry is PlaceEntry)
+        {
+          var hints = new HashTable<string, string> (str_hash, str_equal);
+          active_entry.set_search (text, hints);
+        }
+    }
+
+    /*
+     * Public Methods
+     */
+    public void set_active_entry_view (PlaceEntry entry, int x)
+    {
+      active_entry = entry;
+      bg.entry_position = x;
+      sections.set_active_entry (entry);
+    }
+  }
+
+  public class PlaceSearchBarBackground : Ctk.Bin
+  {
+    /* This is a full path right now as we get this asset from the assets
+     * package that is not installable (easily) normally. Will change to
+     * Config.DATADIR as soon as this is fixed in the other package.
+     */
+    public const string BG = "/usr/share/unity/dash_background.png";
+
+    private int last_width = 0;
+    private int last_height = 0;
+
+    Gdk.Pixbuf tile = null;
+
+    private int _entry_position = 0;
+    public int entry_position {
+      get { return _entry_position; }
+      set {
+        if (_entry_position != value)
+          {
+            _entry_position = value;
+            update_background ();
+          }
+      }
+    }
+
+    private Clutter.CairoTexture texture;
+    private Ctk.EffectGlow       glow;
+
+    public PlaceSearchEntry search_entry { get; construct; }
+
+    public PlaceSearchBarBackground (PlaceSearchEntry search_entry)
+    {
+      Object (search_entry:search_entry);
+    }
+
+    construct
+    {
+      try
+        {
+          /* I've loaded this in directly and not through theme due to use
+           * not having a good loader for pixbufs from the theme right now
+           */
+          tile = new Gdk.Pixbuf.from_file (BG);
+        }
+      catch (Error e)
+        {
+          warning ("Unable to load dash background");
+        }
+
+      texture = new Clutter.CairoTexture (10, 10);
+      add_actor (texture);
+      texture.show ();
+
+      /* Enable once clutk bug is fixed */
+      glow = new Ctk.EffectGlow ();
+      glow.set_color ({ 255, 255, 255, 255 });
+      glow.set_factor (1.0f);
+      glow.set_margin (5);
+      add_effect (glow);
+    }
+
+    private override void allocate (Clutter.ActorBox        box,
+                                    Clutter.AllocationFlags flags)
+    {
+      int width = (int)(box.x2 - box.x1);
+      int height = (int)(box.y2 - box.y1);
+
+      base.allocate (box, flags);
+
+      if (width != last_width || height != last_height)
+        {
+          last_width = width;
+          last_height = height;
+
+          Timeout.add (0, update_background);
+        }
+    }
+
+    public bool update_background ()
+    {
+      Cairo.Context cr;
+
+      texture.set_surface_size (last_width, last_height);
+
+      cr = texture.create ();
+
+      cr.set_operator (Cairo.Operator.CLEAR);
+      cr.paint ();
+
+      cr.set_operator (Cairo.Operator.OVER);
+      cr.set_line_width (1.5);
+      cr.set_source_rgba (1.0, 1.0, 1.0, 0.0);
+
+      cr.translate (0.5, 0.5);
+