Merge lp:~unity-team/unity/unity.dbusmenu-quicklists into lp:unity

[Gord Allott]

builds quicklists based off dbusmenu's, namely one for the bottom half one for the top. top part of the menu is based on Indicator desktop shortcuts api. the only desktop shortcuts that should show up are those that use the Unity identifier so nothing is there right now until desktop files are modified.

Known issues:
  Wrong rendering for the menu items, not using the unity menu item rendering because nothing shows up when i do, need Mirco to take a look at that. So its just using Ctk.MenuItem rendering
  Menu's sometimes jump to the right, long time Unity.QuicklistView bug, not sure what is going on, need Mirco to take a look also.
  Arrow is in the wrong position when menu is opened. Bug in the menu view rendering, hoping its fixed with mirco's resizing menus addition.]

Testing:
  No tests right now, had to disable the previous tests built on quicklists (because the api changed). need to spend friday/thursday building new ones.

[Gord Allott (gordallott)]

requires lp:~unity-team/clutk/clutk.menuitems now, some ctk menu bugfixes in there

[Neil J. Patel (njpatel)]

Code looks fine, but let's wait until the issues you've mentioned are fixed today/tomorrow and the clutk.menuitem branch is approved and merged.

review: Abstain

=== modified file 'configure.ac'
--- configure.ac	2010-07-13 15:04:53 +0000
+++ configure.ac	2010-07-14 16:07:41 +0000
@@ -97,6 +97,7 @@
                   clutter-gtk-0.10 >= 0.10
                   clutk-0.3 >= 0.3.26
                   dbus-glib-1
+                  dbusmenu-glib >= 0.3.4
                   dee-1.0 >= 0.2.0
                   glib-2.0 >= $GLIB_REQUIRED
                   gobject-2.0 >= $GLIB_REQUIRED
 
=== modified file 'targets/mutter/Makefile.am'
--- targets/mutter/Makefile.am	2010-06-21 07:33:51 +0000
+++ targets/mutter/Makefile.am	2010-07-14 16:07:41 +0000
@@ -39,6 +39,7 @@
   --pkg clutter-gtk-0.10 \
   --pkg clutk-0.3 \
   --pkg dbus-glib-1 \
+  --pkg Dbusmenu-Glib-0.2 \
   --pkg dee-1.0 \
   --pkg gtk+-2.0 \
   --pkg gee-1.0 \
 
=== modified file 'targets/mutter/expose-manager.vala'
--- targets/mutter/expose-manager.vala	2010-06-10 20:47:05 +0000
+++ targets/mutter/expose-manager.vala	2010-07-14 16:07:41 +0000
@@ -132,11 +132,11 @@
 
     public void start_expose (SList<Clutter.Actor> windows)
     {
-      var controller = Launcher.QuicklistController.get_default ();
-      if (controller.menu_is_open ())
+      var controller = Launcher.QuicklistController.get_current_menu ();
+      if (controller.is_menu_open ())
         {
-          controller.menu.destroy.connect (this.end_expose);
-          this.menu_in_hover_close_state = controller.menu.get_close_on_leave ();
+          controller.get_view ().destroy.connect (this.end_expose);
+          this.menu_in_hover_close_state = controller.get_view ().get_close_on_leave ();
         }
       exposed_windows = new List<ExposeClone> ();
 
@@ -152,44 +152,46 @@
 
       foreach (Clutter.Actor actor in windows)
         {
-          if (!(actor is Mutter.Window) || 
+          if (!(actor is Mutter.Window) ||
                ((actor as Mutter.Window).get_window_type () != Mutter.MetaCompWindowType.NORMAL &&
                 (actor as Mutter.Window).get_window_type () != Mutter.MetaCompWindowType.DIALOG &&
                 (actor as Mutter.Window).get_window_type () != Mutter.MetaCompWindowType.MODAL_DIALOG))
             continue;
-        
+
           ExposeClone clone = new ExposeClone (actor);
           clone.set_position (actor.x, actor.y);
           clone.set_size (actor.width, actor.height);
           exposed_windows.append (clone);
           clone.reactive = true;
-          
+
           expose_group.add_actor (clone);
-          
+
           clone.hovered_opacity = hovered_opacity;
           clone.unhovered_opacity = unhovered_opacity;
           clone.opacity = unhovered_opacity;
           clone.darken = darken;
-          
+
           clone.enter_event.connect (() => {
-                var ql_controller = Launcher.QuicklistController.get_default ();
-                if (ql_controller.menu_is_open () && this.menu_in_hover_close_state)
+                var ql_controller = Launcher.QuicklistController.get_current_menu ();
+                if (ql_controller.state == Launcher.QuicklistControllerState.MENU
+                    && this.menu_in_hover_close_state)
                   {
-                    ql_controller.menu.set_close_on_leave (false);
+                    ql_controller.get_view ().set_close_on_leave (false);
                   }
                 return false;
               });
 
           clone.leave_event.connect (() => {
-                var ql_controller = Launcher.QuicklistController.get_default ();
-                if (ql_controller.menu_is_open () && this.menu_in_hover_close_state)
+                var ql_controller = Launcher.QuicklistController.get_current_menu ();
+                if (ql_controller.state == Launcher.QuicklistControllerState.MENU
+                    && this.menu_in_hover_close_state)
                   {
-                    ql_controller.menu.set_close_on_leave (true);
+                    ql_controller.get_view ().set_close_on_leave (true);
                   }
                 return false;
               });
         }
-      
+
       unowned GLib.List<Mutter.Window> mutter_windows = owner.plugin.get_windows ();
       foreach (Mutter.Window w in mutter_windows)
         {
@@ -214,11 +216,11 @@
 
     public void end_expose ()
     {
-      var controller = Launcher.QuicklistController.get_default ();
-      if (controller.menu_is_open ())
+      var controller = Launcher.QuicklistController.get_current_menu ();
+      if (controller.is_menu_open ())
         {
-          controller.menu.destroy.disconnect (this.end_expose);
-          controller.close_menu ();
+          controller.get_view ().destroy.disconnect (this.end_expose);
+          controller.state = Launcher.QuicklistControllerState.CLOSED;
         }
 
       unowned GLib.List<Mutter.Window> mutter_windows = owner.plugin.get_windows ();
@@ -521,9 +523,9 @@
 
       unowned Clutter.Actor actor = this.stage.get_actor_at_pos (Clutter.PickMode.REACTIVE, (int) x, (int) y);
 
-      unowned Clutter.Actor? menu = null;
-      if (Unity.Launcher.QuicklistController.get_default ().menu_is_open ())
-        menu = Unity.Launcher.QuicklistController.get_default ().menu;
+      Clutter.Actor? menu = null;
+      if (Unity.Launcher.QuicklistController.get_current_menu ().is_menu_open ())
+        menu = Unity.Launcher.QuicklistController.get_current_menu ().get_view ();
       if (menu != null)
         {
           if (x > menu.x && x < menu.x + menu.width && y > menu.y && y < menu.y + menu.height)
 
=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-07-08 13:48:39 +0000
+++ targets/mutter/plugin.vala	2010-07-14 16:07:41 +0000
@@ -318,9 +318,10 @@
         {
           this.launcher.get_view ().hide ();
           this.panel.hide ();
-          var menu = Unity.Launcher.QuicklistController.get_default ();
-          if (menu.menu_is_open ())
-            menu.close_menu ();
+          var menu = Unity.Launcher.QuicklistController.get_current_menu ();
+          if (menu.is_menu_open ())
+            menu.state = Unity.Launcher.QuicklistControllerState.CLOSED;
+
           fullscreen_obstruction = true;
         }
       else
 
=== modified file 'targets/unity/Makefile.am'
--- targets/unity/Makefile.am	2010-06-10 00:17:10 +0000
+++ targets/unity/Makefile.am	2010-07-14 16:07:41 +0000
@@ -37,6 +37,7 @@
   --pkg config \
   --pkg dee-1.0 \
   --pkg dbus-glib-1 \
+  --pkg Dbusmenu-Glib-0.2 \
   --pkg gtk+-2.0 \
   --pkg gdk-2.0 \
   --pkg gee-1.0 \
 
=== modified file 'tests/ui/Makefile.am'
--- tests/ui/Makefile.am	2010-06-10 00:17:10 +0000
+++ tests/ui/Makefile.am	2010-07-14 16:07:41 +0000
@@ -28,6 +28,7 @@
   --pkg clutter-1.0 \
   --pkg clutter-gtk-0.10 \
   --pkg dbus-glib-1 \
+  --pkg Dbusmenu-Glib-0.2 \
   --pkg dee-1.0 \
   --pkg gtk+-2.0 \
   --pkg gdk-2.0 \
 
=== modified file 'tests/ui/test-automate.vala'
--- tests/ui/test-automate.vala	2010-06-08 22:55:07 +0000
+++ tests/ui/test-automate.vala	2010-07-14 16:07:41 +0000
@@ -74,13 +74,14 @@
 
     private void test_automation ()
     {
+/*
       ObjectRegistry registry = ObjectRegistry.get_default ();
 
       Logging.init_fatal_handler ();
 
       QuicklistController qlcontroller = QuicklistController.get_default ();
       ScrollerModel scroller = registry.lookup ("UnityScrollerModel").get(0) as ScrollerModel;
-      
+
       gTimer = new GLib.Timer();
       int DT = 2500;
       stdout.printf("\n");
@@ -95,36 +96,36 @@
           Clutter.Animation? anim;
           launcher.opacity = 255;
 
-          
+
           gTimer.start ();
           anim = launcher.animate (Clutter.AnimationMode.EASE_IN_SINE, 2500, "opacity", 0);
           //anim.started.connect (on_animation_started);
           anim.completed.connect (on_animation_completed);
           dir.do_wait_for_animation (launcher);
-          
+
           float dt = (float)gTimer.elapsed ();
           float dt0 =  (float)DT/1000.0f;
           stdout.printf("Expected Duration: %2.3f, Observed Duration: %2.3f, Error: %2.3f%%\n", dt0, dt,
                         (dt - dt0)*100.0f/dt0);
-          
+
           gTimer.start ();
           anim = launcher.animate (Clutter.AnimationMode.EASE_IN_SINE, 2500, "opacity", 255);
           //anim.started.connect (on_animation_started);
           anim.completed.connect (on_animation_completed);
           dir.do_wait_for_animation (launcher);
-          
+
           dt = (float)gTimer.elapsed ();
           dt0 =  (float)DT/1000.0f;
           stdout.printf("Expected Duration: %2.3f, Observed Duration: %2.3f, Error: %2.3f%%\n", dt0, dt,
                         (dt - dt0)*100.0f/dt0);
 
-          
+
           //dir.do_wait_for_timeout (5000);
         }
-      
-      //debug ("After Animation");               
-      /* Clean up */
+
+      //debug ("After Animation");
       qlcontroller.close_menu ();
+*/
     }
   }
 }
 
=== modified file 'tests/ui/test-quicklist.vala'
--- tests/ui/test-quicklist.vala	2010-06-03 13:14:06 +0000
+++ tests/ui/test-quicklist.vala	2010-07-14 16:07:41 +0000
@@ -60,6 +60,7 @@
 
     private void test_controller_show_label ()
     {
+/*
       string img = TESTDIR + "/data/quicklist_controller_show_label.png";
       ObjectRegistry registry = ObjectRegistry.get_default ();
 
@@ -76,8 +77,9 @@
 
       assert (Utils.compare_snapshot (stage, img, 54, 30, 200, 50));
 
-      /* Clean up */
       qlcontroller.close_menu ();
+    */
     }
+
   }
 }
 
=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2010-06-29 13:01:44 +0000
+++ tests/unit/Makefile.am	2010-07-14 16:07:41 +0000
@@ -30,6 +30,7 @@
   --pkg clutter-1.0 \
   --pkg clutter-gtk-0.10 \
   --pkg dbus-glib-1 \
+  --pkg Dbusmenu-Glib-0.2 \
   --pkg dee-1.0 \
   --pkg gtk+-2.0 \
   --pkg gdk-2.0 \
 
=== modified file 'tests/unit/test-launcher.vala'
--- tests/unit/test-launcher.vala	2010-06-16 20:43:20 +0000
+++ tests/unit/test-launcher.vala	2010-07-14 16:07:41 +0000
@@ -101,7 +101,7 @@
 			return test_user_visible;
 		}
 
-		public override string view_type ()
+		public override unowned string view_type ()
 		{
 			return "test";
 		}
 
=== modified file 'unity-private/Makefile.am'
--- unity-private/Makefile.am	2010-06-21 10:10:30 +0000
+++ unity-private/Makefile.am	2010-07-14 16:07:41 +0000
@@ -41,9 +41,9 @@
   --pkg clutter-1.0 \
   --pkg clutter-gtk-0.10 \
   --pkg config \
-  --pkg dbus-glib-1 \
   --pkg cogl-1.0 \
   --pkg dbus-glib-1 \
+  --pkg Dbusmenu-Glib-0.2\
   --pkg dee-1.0 \
   --pkg gconf-2.0 \
   --pkg gdk-2.0 \
@@ -103,7 +103,12 @@
   launcher/application-controller.vala \
   launcher/launcher.vala \
   launcher/launcher-child.vala \
+  launcher/quicklist-check-menu-item.vala \
   launcher/quicklist-controller.vala \
+  launcher/quicklist-image-menu-item.vala \
+  launcher/quicklist-menu-item.vala \
+  launcher/quicklist-radio-menu-item.vala \
+  launcher/quicklist-seperator-menu-item.vala \
   launcher/quicklist-view.vala \
   launcher/scrollerchild-controller.vala \
   launcher/scrollerchild.vala \
 
=== modified file 'unity-private/launcher/application-controller.vala'
--- unity-private/launcher/application-controller.vala	2010-07-08 13:48:39 +0000
+++ unity-private/launcher/application-controller.vala	2010-07-14 16:07:41 +0000
@@ -157,18 +157,21 @@
   public class ApplicationController : ScrollerChildController
   {
     public string desktop_file { get; private set; }
-    
+
     private KeyFile desktop_keyfile;
     private string icon_name;
     private Unity.ThemeFilePath theme_file_path;
     private Bamf.Application? app = null;
+    private Dbusmenu.Client menu_client;
+    private Dbusmenu.Menuitem cached_menu;
+    private int menu_items_realized_counter;
 
     private bool is_favorite = false;
 
     public ApplicationController (string? desktop_file_, ScrollerChild child_)
     {
       Object (child: child_);
-      
+
       if (desktop_file_ != null)
         {
           desktop_file = desktop_file_;
@@ -200,21 +203,25 @@
             }
         }
 
-      //connect to our quicklist signals so that we can expose and de-expose
-      // windows at the correct time
-      var controller = QuicklistController.get_default ();
-      controller.menu_state_changed.connect ((open) => {
-        if (controller.get_attached_actor () == child && app != null)
-          {
-            // this is a menu relating to us
-            if (open)
-              {
-                Unity.global_shell.expose_xids (app.get_xids ());
-              }
-            else
-              {
-                Unity.global_shell.stop_expose ();
-              }
+      notify["menu"].connect (on_notify_menu);
+    }
+
+    public override QuicklistController get_menu_controller ()
+    {
+      QuicklistController new_menu = new ApplicationQuicklistController (this);
+      return new_menu;
+    }
+
+    private void on_notify_menu ()
+    {
+      menu.notify["state"].connect (() => {
+        if (menu.state == QuicklistControllerState.MENU)
+          {
+            Unity.global_shell.expose_xids (app.get_xids ());
+          }
+        else
+          {
+            Unity.global_shell.stop_expose ();
           }
       });
     }
@@ -240,6 +247,19 @@
         }
     }
 
+    public bool is_sticky ()
+    {
+      if (desktop_file == "" || desktop_file == null)
+        return false;
+
+      var favorites = Unity.Favorites.get_default ();
+      string uid = favorites.find_uid_for_desktop_file (desktop_file);
+      if (uid != null && uid != "")
+        return true;
+      else
+        return false;
+    }
+
     public void close_windows ()
     {
       if (app is Bamf.Application)
@@ -295,6 +315,134 @@
         }
     }
 
+    public override void get_menu_actions (ScrollerChildController.menu_cb callback)
+    {
+
+      // first check to see if we have a cached client, if we do, just re-use that
+      if (menu_client is Dbusmenu.Client && cached_menu is Dbusmenu.Menuitem)
+        {
+          callback (cached_menu);
+        }
+
+      // check for a menu from bamf
+      if (app is Bamf.Application)
+        {
+          GLib.List<Bamf.View> views = app.get_children ();
+          foreach (Bamf.View view in views)
+            {
+              if (view is Bamf.Indicator)
+                {
+                  string path = (view as Bamf.Indicator).get_dbus_menu_path ();
+                  string remote_address = (view as Bamf.Indicator).get_remote_address ();
+                  string remote_path = (view as Bamf.Indicator).get_remote_path ();
+
+                  // Yes, right here, i have lambda's inside lambda's... shutup.
+                  menu_client = new Dbusmenu.Client (remote_address, path);
+                  menu_client.layout_updated.connect (() => {
+                    var menu = menu_client.get_root ();
+                    cached_menu = menu;
+                    if (menu is Dbusmenu.Menuitem == false)
+                      warning (@"Didn't get a menu for path: $path - address: $remote_address");
+
+                    unowned GLib.List<Dbusmenu.Menuitem> menu_items = menu.get_children ();
+                    menu_items_realized_counter = (int)menu_items.length ();
+                    foreach (Dbusmenu.Menuitem menuitem in menu_items)
+                    {
+                      menuitem.realized.connect (() =>
+                        {
+                          menu_items_realized_counter -= 1;
+                          if (menu_items_realized_counter < 1)
+                            {
+                              callback (menu);
+                            }
+
+                        });
+                    }
+                  });
+                }
+            }
+        }
+
+
+      if (desktop_file == "" || desktop_file == null)
+        {
+          callback (null);
+        }
+
+      // find our desktop shortcuts
+      Indicator.DesktopShortcuts shortcuts = new Indicator.DesktopShortcuts (desktop_file, "Unity");
+      unowned string [] nicks = shortcuts.get_nicks ();
+
+      if (nicks.length < 1)
+        callback (null);
+
+      Dbusmenu.Menuitem root = new Dbusmenu.Menuitem ();
+      root.set_root (true);
+
+      foreach (string nick in nicks)
+        {
+          string local_nick = nick.dup ();
+          unowned string name = shortcuts.nick_get_name (local_nick);
+          string local_name = name.dup ();
+
+          Dbusmenu.Menuitem shortcut_item = new Dbusmenu.Menuitem ();
+          shortcut_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, local_name);
+          shortcut_item.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
+          shortcut_item.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
+          shortcut_item.item_activated.connect ((timestamp) => {
+            shortcuts.nick_exec (local_nick);
+          });
+          root.child_append (shortcut_item);
+
+        }
+      callback (root);
+    }
+
+
+    public override void get_menu_navigation (ScrollerChildController.menu_cb callback)
+    {
+
+      // build a dbusmenu that represents our generic application handling items
+      Dbusmenu.Menuitem root = new Dbusmenu.Menuitem ();
+      root.set_root (true);
+
+      if (desktop_file != null)
+        {
+          Dbusmenu.Menuitem pinning_item = new Dbusmenu.Menuitem ();
+          if (is_sticky ())
+            pinning_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "Remove from launcher");
+          else
+            pinning_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "Add to launcher");
+
+          pinning_item.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
+          pinning_item.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
+          pinning_item.item_activated.connect ((timestamp) => {
+            set_sticky (!is_sticky ());
+          });
+
+          root.child_append (pinning_item);
+        }
+
+      if (app is Bamf.Application)
+        {
+          Dbusmenu.Menuitem app_item = new Dbusmenu.Menuitem ();
+          app_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "Quit...");
+          app_item.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
+          app_item.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
+
+          app_item.item_activated.connect ((timestamp) => {
+            if (app is Bamf.Application)
+              {
+                Array<uint32> xids = app.get_xids ();
+                Unity.global_shell.close_xids (xids);
+              }
+          });
+          root.child_append (app_item);
+        }
+
+        callback (root);
+    }
+
     public override Gee.ArrayList<ShortcutItem> get_menu_shortcuts ()
     {
       // get the desktop file
@@ -530,6 +678,7 @@
       Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
       theme_file_path.add_icon_theme (theme);
       theme = new Gtk.IconTheme ();
+
       theme.set_custom_theme ("unity-icon-theme");
       theme_file_path.add_icon_theme (theme);
       theme.set_custom_theme ("Web");
 
=== added file 'unity-private/launcher/quicklist-check-menu-item.vala'
--- unity-private/launcher/quicklist-check-menu-item.vala	1970-01-01 00:00:00 +0000
+++ unity-private/launcher/quicklist-check-menu-item.vala	2010-07-14 16:07:41 +0000
@@ -0,0 +1,228 @@
+/* -*- 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 Gordon Allott <[e-mail]>,
+ *
+ */
+
+namespace Unity.Launcher
+{
+  public class QuicklistCheckMenuItem : Ctk.CheckMenuItem
+  {
+    Ctk.LayerActor item_background;
+    int            old_width;
+    int            old_height;
+    string         old_label;
+
+    private override void
+    paint ()
+    {
+      this.item_background.paint ();
+    }
+
+
+    public override void
+    get_preferred_height (float     for_width,
+                          out float min_height_p,
+                          out float natural_height_p)
+    {
+      min_height_p = (float) Ctk.em_to_pixel (ITEM_HEIGHT);
+      natural_height_p = min_height_p;
+    }
+
+    public override void
+    get_preferred_width (float for_height,
+                         out float min_width_p,
+                         out float natural_width_p)
+    {
+      int width;
+      int height;
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+      Unity.QuicklistRendering.Item.get_text_extents (settings.gtk_font_name,
+                                                      this.label + " ☐",
+                                                      out width,
+                                                      out height);
+      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
+      natural_width_p = min_width_p;
+    }
+
+    private override void
+    allocate (Clutter.ActorBox        box,
+              Clutter.AllocationFlags flags)
+    {
+      int w;
+      int h;
+      Clutter.Color white_color = Clutter.Color () {
+        red   = 255,
+        green = 255,
+        blue  = 255,
+        alpha = 255
+      };
+
+      base.allocate (box, flags);
+
+      w = (int) (box.x2 - box.x1);
+      h = (int) (box.y2 - box.y1);
+
+      // exit early if the allocation-width/height didn't change, this is needed
+      // because clutter triggers calling allocate even if nothing changed
+      if ((old_width == w) && (old_height == h))
+        return;
+
+      // store the new width/height
+      old_width  = w;
+      old_height = h;
+
+      // before creating a new CtkLayerActor make sure we don't leak any memory
+      if (this.item_background is Ctk.LayerActor)
+         this.item_background.unparent ();
+      this.item_background = new Ctk.LayerActor (w, h);
+
+      Ctk.Layer normal_layer = new Ctk.Layer (w,
+                                              h,
+                                              Ctk.LayerRepeatMode.NONE,
+                                              Ctk.LayerRepeatMode.NONE);
+      Ctk.Layer selected_layer = new Ctk.Layer (w,
+                                                h,
+                                                Ctk.LayerRepeatMode.NONE,
+                                                Ctk.LayerRepeatMode.NONE);
+
+      Cairo.Surface normal_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
+                                                          w,
+                                                          h);
+      Cairo.Surface selected_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
+                                                            w,
+                                                            h);
+
+      Cairo.Context normal_cr = new Cairo.Context (normal_surf);
+      Cairo.Context selected_cr = new Cairo.Context (selected_surf);
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+
+      string formatted_label = label;
+      if (active)
+        formatted_label = formatted_label + " ☑";
+      else
+        formatted_label = formatted_label + " ☐";
+
+      Unity.QuicklistRendering.Item.normal_mask (normal_cr,
+                                                 w,
+                                                 h,
+                                                 settings.gtk_font_name,
+                                                 formatted_label);
+      Unity.QuicklistRendering.Item.selected_mask (selected_cr,
+                                                   w,
+                                                   h,
+                                                   settings.gtk_font_name,
+                                                   formatted_label);
+
+      normal_layer.set_mask_from_surface (normal_surf);
+      normal_layer.set_color (white_color);
+
+      selected_layer.set_mask_from_surface (selected_surf);
+      selected_layer.set_color (white_color);
+
+      this.item_background.add_layer (normal_layer);
+      this.item_background.add_layer (selected_layer);
+
+      this.item_background.get_layer(0).set_enabled (true);
+      this.item_background.get_layer(1).set_enabled (false);
+      this.item_background.do_queue_redraw ();
+
+      this.item_background.set_parent (this);
+      this.item_background.map ();
+      this.item_background.show ();
+    }
+
+    private bool _on_enter (Clutter.Event event)
+    {
+      this.item_background.get_layer(0).set_enabled (false);
+      this.item_background.get_layer(1).set_enabled (true);
+
+      // Ensure we are associated with a stage before queuing a draw to
+      // avoid a rather annoying (but rare) crash in clutter
+      if (this.get_stage () is Clutter.Stage)
+        this.do_queue_redraw ();
+      return false;
+    }
+
+    private bool _on_leave (Clutter.Event event)
+    {
+      this.item_background.get_layer(0).set_enabled (true);
+      this.item_background.get_layer(1).set_enabled (false);
+      if (this.get_stage () is Clutter.Stage)
+        this.do_queue_redraw ();
+      return false;
+    }
+
+    private void _on_label_changed ()
+    {
+      // if the contents of the label didn't really change exit early
+      if (old_label == this.label)
+        return;
+
+      old_label = this.label;
+    }
+
+    private bool _on_mouse_down (Clutter.Event event)
+    {
+      this.notify["label"].disconnect (this._on_label_changed);
+      this.enter_event.disconnect (this._on_enter);
+      this.leave_event.disconnect (this._on_leave);
+      this.button_press_event.disconnect (this._on_mouse_down);
+      this.activated ();
+      return true;
+    }
+
+    ~QuicklistMenuItem ()
+    {
+      this.notify["label"].disconnect (this._on_label_changed);
+      this.enter_event.disconnect (this._on_enter);
+      this.leave_event.disconnect (this._on_leave);
+      this.button_press_event.disconnect (this._on_mouse_down);
+    }
+
+    construct
+    {
+      Ctk.Padding padding = Ctk.Padding () {
+        left   = (int) Ctk.em_to_pixel (MARGIN),
+        right  = (int) Ctk.em_to_pixel (MARGIN),
+        top    = (int) Ctk.em_to_pixel (MARGIN),
+        bottom = (int) Ctk.em_to_pixel (MARGIN)
+      };
+      this.set_padding (padding);
+      this.notify["label"].connect (this._on_label_changed);
+      this.enter_event.connect (this._on_enter);
+      this.leave_event.connect (this._on_leave);
+      this.button_press_event.connect (this._on_mouse_down);
+
+      this.reactive = true;
+
+      old_width  = 0;
+      old_height = 0;
+      old_label  = "";
+    }
+
+    public QuicklistCheckMenuItem ()
+    {
+      Object (label: "");
+    }
+
+    public QuicklistCheckMenuItem.with_label (string label)
+    {
+      Object (label: label);
+    }
+  }
+}
 
=== modified file 'unity-private/launcher/quicklist-controller.vala'
--- unity-private/launcher/quicklist-controller.vala	2010-06-04 13:39:25 +0000
+++ unity-private/launcher/quicklist-controller.vala	2010-07-14 16:07:41 +0000
@@ -19,134 +19,308 @@
  */
 namespace Unity.Launcher
 {
-  public static QuicklistController? ql_controler_singleton;
-
-  public class QuicklistController : Object
-  {
-
-    public static unowned QuicklistController get_default ()
-    {
-      if (Unity.Launcher.ql_controler_singleton == null) {
-        Unity.Launcher.ql_controler_singleton= new QuicklistController ();
-      }
-      return Unity.Launcher.ql_controler_singleton;
-    }
-
-    public weak Ctk.Menu menu;
-    public bool is_in_label = false;
-    public bool is_in_menu = false;
-
-    public signal void menu_state_changed (bool open);
-
-    public QuicklistController ()
+  public static QuicklistController? ql_controller_singleton;
+
+  public enum QuicklistControllerState {
+    LABEL,
+    MENU,
+    CLOSED
+  }
+
+  public abstract class QuicklistController : Object
+  {
+    protected Ctk.Menu? menu;
+    public ScrollerChildController attached_controller {get; construct;}
+    private QuicklistControllerState _state;
+    public QuicklistControllerState state {
+      get { return _state; }
+      set
+        {
+          if (value == QuicklistControllerState.LABEL ||
+              value == QuicklistControllerState.MENU)
+            {
+              // check our singleton for a previous menu
+              if (ql_controller_singleton != this && ql_controller_singleton != null)
+                {
+                  var tmp_qlc = ql_controller_singleton; //ref the controller
+                  tmp_qlc.state = QuicklistControllerState.CLOSED;
+                  if (tmp_qlc.get_view () != null)
+                    warning ("old menu not destroyed when opening new menu");
+                }
+
+              ql_controller_singleton = this;
+            }
+
+          if (value == QuicklistControllerState.CLOSED)
+            {
+              if (menu is Ctk.Menu)
+                {
+                  menu.destroy ();
+                  menu = null;
+
+                }
+              ql_controller_singleton = null;
+            }
+
+          _state = value;
+        }
+    }
+
+    public abstract Ctk.Menu? get_view ();
+
+    public static unowned QuicklistController get_current_menu ()
+    {
+      // returns the current controller, thou does not own this!
+      return ql_controller_singleton;
+    }
+
+
+    public static bool is_menu_open ()
+    {
+      // returns true if a menu is open
+      if (ql_controller_singleton is QuicklistController)
+        return ql_controller_singleton.state == QuicklistControllerState.MENU;
+
+      return false;
+    }
+
+    public static bool do_menus_match (QuicklistController menu)
+    {
+      // returns true if the given menu matches ql_controller_singleton
+      return menu == ql_controller_singleton;
+    }
+  }
+
+
+  public class ApplicationQuicklistController : QuicklistController
+  {
+    public ApplicationQuicklistController (ApplicationController scroller_child)
+    {
+      Object (attached_controller: scroller_child);
+    }
+
+    construct
     {
       Unity.Testing.ObjectRegistry.get_default ().register ("QuicklistController",
                                                             this);
-    }
-
-    construct
-    {
-      var drag_controller = Drag.Controller.get_default ();
-      drag_controller.drag_start.connect (this.on_unity_drag_start);
-    }
-
-    private void on_unity_drag_start (Drag.Model model)
-    {
-      if (this.menu_is_open ())
-        this.menu.destroy ();
-    }
-
-    public void show_label (string label, Ctk.Actor attached_widget)
-    {
-      if (this.menu_is_open ())
-        this.menu.destroy ();
-
-      var menu = new QuicklistMenu () as Ctk.Menu;
+
+      new_menu ();
+      notify["state"].connect (on_state_change);
+      state = QuicklistControllerState.LABEL;
+    }
+
+    private void new_menu ()
+    {
+      menu = new QuicklistMenu () as Ctk.Menu;
       menu.destroy.connect (() => {
-        if (is_in_menu)
-          menu_state_changed (false);
-      });
-      this.menu = menu;
-      this.menu.destroy.connect (() => {
         Unity.global_shell.remove_fullscreen_request (this);
       });
-      this.menu.set_swallow_clicks (Unity.global_shell.menus_swallow_events);
-      this.menu.set_detect_clicks (false);
-
-      //make label
-      var menuitem = new QuicklistMenuItem (label);
-      menuitem.activated.connect (this.close_menu);
-      menuitem.reactive = true;
-      this.menu.append (menuitem, true);
-      this.menu.attach_to_actor (attached_widget);
-      (attached_widget.get_stage () as Clutter.Stage).add_actor (this.menu);
+      menu.set_swallow_clicks (Unity.global_shell.menus_swallow_events);
+      menu.set_detect_clicks (false);
+      menu.attach_to_actor (attached_controller.child as Ctk.Actor);
+      ((attached_controller).child.get_stage () as Clutter.Stage).add_actor (menu);
 
       float x;
       float y;
-      this.menu.get_position (out x, out y);
-      this.menu.set_position (x - (float) 22.0f, y - 1.0f);
-      this.is_in_label = true;
-    }
-
-    private Gee.ArrayList<ShortcutItem> prefix_cache;
-    private Gee.ArrayList<ShortcutItem> affix_cache;
-
-    public void show_menu (Gee.ArrayList<ShortcutItem> prefix_shortcuts,
-                           Gee.ArrayList<ShortcutItem> affix_shortcuts,
-                           bool hide_on_leave)
-    {
-      this.prefix_cache = prefix_shortcuts;
-      this.affix_cache = affix_shortcuts;
-
-      this.is_in_label = false;
-      Unity.global_shell.add_fullscreen_request (this);
-      this.menu.close_on_leave = hide_on_leave;
-      foreach (ShortcutItem shortcut in prefix_shortcuts)
-        {
-          var label = shortcut.get_name ();
-          var menuitem = new QuicklistMenuItem (label);
-          this.menu.prepend (menuitem, false);
-          menuitem.activated.connect (shortcut.activated);
-          menuitem.activated.connect (this.close_menu);
-        }
-
-      /* Only add the separator if there are shortcuts beneath  */
-      if (affix_shortcuts.size > 0)
-        {
-          Unity.Launcher.QuicklistMenuSeperator separator = new Unity.Launcher.QuicklistMenuSeperator ();
-          this.menu.append (separator, false);
-        }
-
-      foreach (ShortcutItem shortcut in affix_shortcuts)
-        {
-          var label = shortcut.get_name ();
-          var menuitem = new QuicklistMenuItem (label);
-          this.menu.append (menuitem, false);
-          menuitem.activated.connect (shortcut.activated);
-          menuitem.activated.connect (this.close_menu);
-        }
-      this.menu.set_detect_clicks (true);
-      menu_state_changed (true);
-    }
-
-    public void close_menu ()
-    {
-      if (this.menu is Ctk.Menu)
-        {
-          this.menu.destroy ();
-        }
-      this.is_in_label = false;
-      this.is_in_menu = false;
-    }
-
-    public bool menu_is_open ()
-    {
-      return this.menu is Ctk.Menu;
-    }
-
-    public Ctk.Actor get_attached_actor ()
-    {
-      return this.menu.get_attached_actor ();
-    }
+      menu.get_position (out x, out y);
+      menu.set_position (x - (float) 22.0f, y - 1.0f);
+    }
+
+    private void on_state_change ()
+    {
+      if (state == QuicklistControllerState.CLOSED) return;
+      if (menu == null)
+        {
+          new_menu ();
+          warning ("state change called on menu when menu does not exist");
+        }
+      if (state == QuicklistControllerState.LABEL)
+        {
+          // just build a menu with a label for the name
+          menu.remove_all ();
+          string label = attached_controller.name;
+
+          var menuitem = new QuicklistMenuItem.with_label (label);
+          menuitem.activated.connect (() => {
+            state = QuicklistControllerState.CLOSED;
+          });
+
+          menu.append (menuitem, true);
+        }
+      else if (state == QuicklistControllerState.MENU)
+        {
+
+          // grab the top menu
+          attached_controller.get_menu_actions ((top_menu) => {
+            if (top_menu is Dbusmenu.Menuitem)
+            if (top_menu.get_root ())
+              {
+                //returns a correct root menu
+                unowned GLib.List<Dbusmenu.Menuitem> menu_items = top_menu.get_children ();
+                if (menu_items != null)
+                  {
+                    var separator = new Unity.Launcher.QuicklistMenuSeperator ();
+                    menu.prepend (separator, false);
+                  }
+                menu_items.reverse ();
+                foreach (Dbusmenu.Menuitem menuitem in menu_items)
+                  {
+                    var view_menuitem = menu_item_from_dbusmenuitem (menuitem);
+                    if (view_menuitem != null)
+                      menu.prepend (view_menuitem, false);
+                  }
+                menu_items.reverse ();
+              }
+            else
+              {
+                warning ("menu given not a root item");
+              }
+          });
+
+          // grab the bottom menu
+          attached_controller.get_menu_navigation ((bottom_menu) => {
+            if (bottom_menu is Dbusmenu.Menuitem)
+              if (bottom_menu.get_root ())
+                {
+                  // add a separator for funsies, also because its in the spec (but mostly the fun part)
+                  var separator = new Unity.Launcher.QuicklistMenuSeperator ();
+                  menu.append (separator, false);
+                  //returns a correct root menu
+                  unowned GLib.List<Dbusmenu.Menuitem> menu_items = bottom_menu.get_children ();
+                  foreach (Dbusmenu.Menuitem menuitem in menu_items)
+                    {
+                      var view_menuitem = menu_item_from_dbusmenuitem (menuitem);
+                      if (view_menuitem != null)
+                        menu.append (view_menuitem, false);
+                    }
+                }
+              else
+                {
+                  warning ("menu given not a root item");
+                }
+          });
+
+          float x;
+          float y;
+          menu.get_position (out x, out y);
+          if (x > 60-22)
+            menu.set_position (x - (float) 22.0f, y - 1.0f);
+        }
+    }
+
+    public override Ctk.Menu? get_view ()
+    {
+      return menu;
+    }
+
+    private Ctk.MenuItem? menu_item_from_dbusmenuitem (Dbusmenu.Menuitem dbusmenuitem)
+    {
+      string label = "UNDEFINED";
+      label = dbusmenuitem.property_get (Dbusmenu.MENUITEM_PROP_LABEL);
+      string type = "label";
+      string check_type = dbusmenuitem.property_get (Dbusmenu.MENUITEM_PROP_TOGGLE_TYPE);
+
+      if (check_type == Dbusmenu.MENUITEM_TOGGLE_CHECK)
+        {
+          type = "check";
+        }
+
+      if (check_type == Dbusmenu.MENUITEM_TOGGLE_RADIO)
+        {
+          type = "radio";
+        }
+
+      if (dbusmenuitem.property_get ("type") == Dbusmenu.CLIENT_TYPES_SEPARATOR)
+        {
+          type = "seperator";
+        }
+
+      if (dbusmenuitem.property_get (Dbusmenu.MENUITEM_PROP_ICON_NAME) != null)
+        {
+          type = "stock_image";
+        }
+
+      Ctk.MenuItem menuitem;
+
+      if (type == "label")
+        {
+          menuitem = new QuicklistMenuItem.with_label (label);
+        }
+
+      else if (type == "check" || type == "radio")
+        {
+          if (type == "check")
+            menuitem = new QuicklistCheckMenuItem.with_label (label);
+          else
+            menuitem = new QuicklistRadioMenuItem.with_label (null, label);
+
+          int checked = dbusmenuitem.property_get_int (Dbusmenu.MENUITEM_PROP_TOGGLE_STATE);
+          if (checked == Dbusmenu.MENUITEM_TOGGLE_STATE_CHECKED)
+            (menuitem as Ctk.CheckMenuItem).set_active (true);
+
+          (menuitem as Ctk.CheckMenuItem).toggled.connect (() =>
+          {
+            int is_checked = ((menuitem as Ctk.CheckMenuItem).get_active ()) ?
+                               Dbusmenu.MENUITEM_TOGGLE_STATE_CHECKED : Dbusmenu.MENUITEM_TOGGLE_STATE_UNCHECKED;
+
+            dbusmenuitem.property_set_int (Dbusmenu.MENUITEM_PROP_TOGGLE_STATE, is_checked);
+          });
+
+          dbusmenuitem.property_changed.connect ((property_name, value) => {
+            if (property_name == Dbusmenu.MENUITEM_PROP_TOGGLE_STATE)
+              {
+                int* value_weak = (int*)(value);
+                (menuitem as Ctk.CheckMenuItem).set_active (
+                  (*value_weak == Dbusmenu.MENUITEM_TOGGLE_STATE_CHECKED) ? true : false
+                 );
+              }
+          });
+        }
+
+      else if (type == "seperator")
+        {
+          menuitem = new QuicklistMenuSeperator ();
+        }
+
+      else
+        {
+          warning ("not a menu item we understand (yet)");
+          return null;
+        }
+
+      //connect to property changes*
+      dbusmenuitem.property_changed.connect ((property_name, value) => {
+        if (property_name == Dbusmenu.MENUITEM_PROP_LABEL)
+          {
+            string* value_weak = (string*)value;
+            menuitem.set_label (value_weak);
+          }
+        else if (property_name == Dbusmenu.MENUITEM_PROP_ENABLED)
+          {
+            bool* value_weak = (bool*)value;
+            menuitem.set_reactive (*value_weak);
+          }
+      });
+
+      menuitem.reactive = dbusmenuitem.property_get_bool (Dbusmenu.MENUITEM_PROP_ENABLED);
+      menuitem.activated.connect (() => {
+        debug ("item was activated...");
+        dbusmenuitem.handle_event ("clicked", null, Clutter.get_current_event_time ());
+        //dbusmenuitem.item_activated (Clutter.get_current_event_time ());
+      });
+
+      menuitem.activated.connect (() => {
+        Idle.add (() => {
+          state = QuicklistControllerState.CLOSED;
+          return false;
+        });
+      });
+
+      // add more menu item types here (check, radio, image) as views are made
+      // right now we can just represent all menuitems as labels
+
+      return menuitem as Ctk.MenuItem;
+    }
+
   }
 }
 
=== added file 'unity-private/launcher/quicklist-image-menu-item.vala'
--- unity-private/launcher/quicklist-image-menu-item.vala	1970-01-01 00:00:00 +0000
+++ unity-private/launcher/quicklist-image-menu-item.vala	2010-07-14 16:07:41 +0000
@@ -0,0 +1,23 @@
+/* -*- 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 Gordon Allott <[e-mail]>,
+ *
+ */
+
+namespace Unity.Launcher
+{
+}
 
=== added file 'unity-private/launcher/quicklist-menu-item.vala'
--- unity-private/launcher/quicklist-menu-item.vala	1970-01-01 00:00:00 +0000
+++ unity-private/launcher/quicklist-menu-item.vala	2010-07-14 16:07:41 +0000
@@ -0,0 +1,225 @@
+/* -*- 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 Gordon Allott <[e-mail]>,
+ *             Mirco "MacSlow" Müller <[e-mail]>
+ *
+ */
+
+namespace Unity.Launcher
+{
+  // we subclass Ctk.MenuItem here because we need to adapt it's appearance
+  public class QuicklistMenuItem : Ctk.MenuItem
+  {
+    Ctk.LayerActor item_background;
+    int            old_width;
+    int            old_height;
+    string         old_label;
+
+    private override void
+    paint ()
+    {
+      this.item_background.paint ();
+    }
+
+
+    public override void
+    get_preferred_height (float     for_width,
+                          out float min_height_p,
+                          out float natural_height_p)
+    {
+      min_height_p = (float) Ctk.em_to_pixel (ITEM_HEIGHT);
+      natural_height_p = min_height_p;
+    }
+
+    public override void
+    get_preferred_width (float for_height,
+                         out float min_width_p,
+                         out float natural_width_p)
+    {
+      int width;
+      int height;
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+      Unity.QuicklistRendering.Item.get_text_extents (settings.gtk_font_name,
+                                                      this.label,
+                                                      out width,
+                                                      out height);
+      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
+      natural_width_p = min_width_p;
+    }
+
+    private override void
+    allocate (Clutter.ActorBox        box,
+              Clutter.AllocationFlags flags)
+    {
+      int w;
+      int h;
+      Clutter.Color white_color = Clutter.Color () {
+        red   = 255,
+        green = 255,
+        blue  = 255,
+        alpha = 255
+      };
+
+      base.allocate (box, flags);
+
+      w = (int) (box.x2 - box.x1);
+      h = (int) (box.y2 - box.y1);
+
+      // exit early if the allocation-width/height didn't change, this is needed
+      // because clutter triggers calling allocate even if nothing changed
+      if ((old_width == w) && (old_height == h))
+        return;
+
+      // store the new width/height
+      old_width  = w;
+      old_height = h;
+
+      // before creating a new CtkLayerActor make sure we don't leak any memory
+      if (this.item_background is Ctk.LayerActor)
+         this.item_background.unparent ();
+      this.item_background = new Ctk.LayerActor (w, h);
+
+      Ctk.Layer normal_layer = new Ctk.Layer (w,
+                                              h,
+                                              Ctk.LayerRepeatMode.NONE,
+                                              Ctk.LayerRepeatMode.NONE);
+      Ctk.Layer selected_layer = new Ctk.Layer (w,
+                                                h,
+                                                Ctk.LayerRepeatMode.NONE,
+                                                Ctk.LayerRepeatMode.NONE);
+
+      Cairo.Surface normal_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
+                                                          w,
+                                                          h);
+      Cairo.Surface selected_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
+                                                            w,
+                                                            h);
+
+      Cairo.Context normal_cr = new Cairo.Context (normal_surf);
+      Cairo.Context selected_cr = new Cairo.Context (selected_surf);
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+
+      Unity.QuicklistRendering.Item.normal_mask (normal_cr,
+                                                 w,
+                                                 h,
+                                                 settings.gtk_font_name,
+                                                 this.label);
+      Unity.QuicklistRendering.Item.selected_mask (selected_cr,
+                                                   w,
+                                                   h,
+                                                   settings.gtk_font_name,
+                                                   this.label);
+
+      normal_layer.set_mask_from_surface (normal_surf);
+      normal_layer.set_color (white_color);
+
+      selected_layer.set_mask_from_surface (selected_surf);
+      selected_layer.set_color (white_color);
+
+      this.item_background.add_layer (normal_layer);
+      this.item_background.add_layer (selected_layer);
+
+      this.item_background.get_layer(0).set_enabled (true);
+      this.item_background.get_layer(1).set_enabled (false);
+      this.item_background.do_queue_redraw ();
+
+      this.item_background.set_parent (this);
+      this.item_background.map ();
+      this.item_background.show ();
+    }
+
+    private bool _on_enter (Clutter.Event event)
+    {
+      this.item_background.get_layer(0).set_enabled (false);
+      this.item_background.get_layer(1).set_enabled (true);
+
+      // Ensure we are associated with a stage before queuing a draw to
+      // avoid a rather annoying (but rare) crash in clutter
+      if (this.get_stage () is Clutter.Stage)
+        this.do_queue_redraw ();
+      return false;
+    }
+
+    private bool _on_leave (Clutter.Event event)
+    {
+      this.item_background.get_layer(0).set_enabled (true);
+      this.item_background.get_layer(1).set_enabled (false);
+      if (this.get_stage () is Clutter.Stage)
+        this.do_queue_redraw ();
+      return false;
+    }
+
+    private void _on_label_changed ()
+    {
+      // if the contents of the label didn't really change exit early
+      if (old_label == this.label)
+        return;
+
+      old_label = this.label;
+    }
+
+    private bool _on_mouse_down (Clutter.Event event)
+    {
+      this.notify["label"].disconnect (this._on_label_changed);
+      this.enter_event.disconnect (this._on_enter);
+      this.leave_event.disconnect (this._on_leave);
+      this.button_press_event.disconnect (this._on_mouse_down);
+      this.activated ();
+      return true;
+    }
+
+    ~QuicklistMenuItem ()
+    {
+      this.notify["label"].disconnect (this._on_label_changed);
+      this.enter_event.disconnect (this._on_enter);
+      this.leave_event.disconnect (this._on_leave);
+      this.button_press_event.disconnect (this._on_mouse_down);
+    }
+
+    construct
+    {
+      Ctk.Padding padding = Ctk.Padding () {
+        left   = (int) Ctk.em_to_pixel (MARGIN),
+        right  = (int) Ctk.em_to_pixel (MARGIN),
+        top    = (int) Ctk.em_to_pixel (MARGIN),
+        bottom = (int) Ctk.em_to_pixel (MARGIN)
+      };
+      this.set_padding (padding);
+
+      this.notify["label"].connect (this._on_label_changed);
+      this.enter_event.connect (this._on_enter);
+      this.leave_event.connect (this._on_leave);
+      this.button_press_event.connect (this._on_mouse_down);
+
+      this.reactive = true;
+
+      old_width  = 0;
+      old_height = 0;
+      old_label  = "";
+    }
+
+    public QuicklistMenuItem ()
+    {
+      Object (label: "");
+    }
+
+    public QuicklistMenuItem.with_label (string label)
+    {
+      Object (label: label);
+    }
+  }
+}
 
=== added file 'unity-private/launcher/quicklist-radio-menu-item.vala'
--- unity-private/launcher/quicklist-radio-menu-item.vala	1970-01-01 00:00:00 +0000
+++ unity-private/launcher/quicklist-radio-menu-item.vala	2010-07-14 16:07:41 +0000
@@ -0,0 +1,230 @@
+/* -*- 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 Gordon Allott <[e-mail]>,
+ *
+ */
+
+namespace Unity.Launcher
+{
+  public class QuicklistRadioMenuItem : Ctk.RadioMenuItem
+  {
+    Ctk.LayerActor item_background;
+    int            old_width;
+    int            old_height;
+    string         old_label;
+
+    private override void
+    paint ()
+    {
+      this.item_background.paint ();
+    }
+
+
+    public override void
+    get_preferred_height (float     for_width,
+                          out float min_height_p,
+                          out float natural_height_p)
+    {
+      min_height_p = (float) Ctk.em_to_pixel (ITEM_HEIGHT);
+      natural_height_p = min_height_p;
+    }
+
+    public override void
+    get_preferred_width (float for_height,
+                         out float min_width_p,
+                         out float natural_width_p)
+    {
+      int width;
+      int height;
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+      Unity.QuicklistRendering.Item.get_text_extents (settings.gtk_font_name,
+                                                      this.label + " ☐",
+                                                      out width,
+                                                      out height);
+      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
+      natural_width_p = min_width_p;
+    }
+
+    private override void
+    allocate (Clutter.ActorBox        box,
+              Clutter.AllocationFlags flags)
+    {
+      int w;
+      int h;
+      Clutter.Color white_color = Clutter.Color () {
+        red   = 255,
+        green = 255,
+        blue  = 255,
+        alpha = 255
+      };
+
+      base.allocate (box, flags);
+
+      w = (int) (box.x2 - box.x1);
+      h = (int) (box.y2 - box.y1);
+
+      // exit early if the allocation-width/height didn't change, this is needed
+      // because clutter triggers calling allocate even if nothing changed
+      if ((old_width == w) && (old_height == h))
+        return;
+
+      // store the new width/height
+      old_width  = w;
+      old_height = h;
+
+      // before creating a new CtkLayerActor make sure we don't leak any memory
+      if (this.item_background is Ctk.LayerActor)
+         this.item_background.unparent ();
+      this.item_background = new Ctk.LayerActor (w, h);
+
+      Ctk.Layer normal_layer = new Ctk.Layer (w,
+                                              h,
+                                              Ctk.LayerRepeatMode.NONE,
+                                              Ctk.LayerRepeatMode.NONE);
+      Ctk.Layer selected_layer = new Ctk.Layer (w,
+                                                h,
+                                                Ctk.LayerRepeatMode.NONE,
+                                                Ctk.LayerRepeatMode.NONE);
+
+      Cairo.Surface normal_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
+                                                          w,
+                                                          h);
+      Cairo.Surface selected_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
+                                                            w,
+                                                            h);
+
+      Cairo.Context normal_cr = new Cairo.Context (normal_surf);
+      Cairo.Context selected_cr = new Cairo.Context (selected_surf);
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+
+      string formatted_label = label;
+      if (active)
+        formatted_label = formatted_label + " ◉";
+      else
+        formatted_label = formatted_label + " ○";
+
+      Unity.QuicklistRendering.Item.normal_mask (normal_cr,
+                                                 w,
+                                                 h,
+                                                 settings.gtk_font_name,
+                                                 formatted_label);
+      Unity.QuicklistRendering.Item.selected_mask (selected_cr,
+                                                   w,
+                                                   h,
+                                                   settings.gtk_font_name,
+                                                   formatted_label);
+
+      normal_layer.set_mask_from_surface (normal_surf);
+      normal_layer.set_color (white_color);
+
+      selected_layer.set_mask_from_surface (selected_surf);
+      selected_layer.set_color (white_color);
+
+      this.item_background.add_layer (normal_layer);
+      this.item_background.add_layer (selected_layer);
+
+      this.item_background.get_layer(0).set_enabled (true);
+      this.item_background.get_layer(1).set_enabled (false);
+      this.item_background.do_queue_redraw ();
+
+      this.item_background.set_parent (this);
+      this.item_background.map ();
+      this.item_background.show ();
+    }
+
+    private bool _on_enter (Clutter.Event event)
+    {
+      this.item_background.get_layer(0).set_enabled (false);
+      this.item_background.get_layer(1).set_enabled (true);
+
+      // Ensure we are associated with a stage before queuing a draw to
+      // avoid a rather annoying (but rare) crash in clutter
+      if (this.get_stage () is Clutter.Stage)
+        this.do_queue_redraw ();
+      return false;
+    }
+
+    private bool _on_leave (Clutter.Event event)
+    {
+      this.item_background.get_layer(0).set_enabled (true);
+      this.item_background.get_layer(1).set_enabled (false);
+      if (this.get_stage () is Clutter.Stage)
+        this.do_queue_redraw ();
+      return false;
+    }
+
+    private void _on_label_changed ()
+    {
+      // if the contents of the label didn't really change exit early
+      if (old_label == this.label)
+        return;
+
+      old_label = this.label;
+    }
+
+    private bool _on_mouse_down (Clutter.Event event)
+    {
+      this.notify["label"].disconnect (this._on_label_changed);
+      this.enter_event.disconnect (this._on_enter);
+      this.leave_event.disconnect (this._on_leave);
+      this.button_press_event.disconnect (this._on_mouse_down);
+      this.activated ();
+      return true;
+    }
+
+    ~QuicklistMenuItem ()
+    {
+      this.notify["label"].disconnect (this._on_label_changed);
+      this.enter_event.disconnect (this._on_enter);
+      this.leave_event.disconnect (this._on_leave);
+      this.button_press_event.disconnect (this._on_mouse_down);
+    }
+
+    construct
+    {
+      Ctk.Padding padding = Ctk.Padding () {
+        left   = (int) Ctk.em_to_pixel (MARGIN),
+        right  = (int) Ctk.em_to_pixel (MARGIN),
+        top    = (int) Ctk.em_to_pixel (MARGIN),
+        bottom = (int) Ctk.em_to_pixel (MARGIN)
+      };
+      this.set_padding (padding);
+      this.notify["label"].connect (this._on_label_changed);
+      this.enter_event.connect (this._on_enter);
+      this.leave_event.connect (this._on_leave);
+      this.button_press_event.connect (this._on_mouse_down);
+
+      this.reactive = true;
+
+      old_width  = 0;
+      old_height = 0;
+      old_label  = "";
+    }
+
+    public QuicklistRadioMenuItem (GLib.SList? group)
+    {
+      Object (label: "",
+              group: group);
+    }
+
+    public QuicklistRadioMenuItem.with_label (GLib.SList? group, string label)
+    {
+      Object (label: label,
+              group: group);
+    }
+  }
+}
 
=== added file 'unity-private/launcher/quicklist-seperator-menu-item.vala'
--- unity-private/launcher/quicklist-seperator-menu-item.vala	1970-01-01 00:00:00 +0000
+++ unity-private/launcher/quicklist-seperator-menu-item.vala	2010-07-14 16:07:41 +0000
@@ -0,0 +1,117 @@
+/* -*- 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 Gordon Allott <[e-mail]>,
+ *             Mirco "MacSlow" Müller <[e-mail]>
+ *
+ */
+
+namespace Unity.Launcher
+{
+  // we subclass Ctk.MenuSeperator here because we need to adapt it's appearance
+  public class QuicklistMenuSeperator : Ctk.MenuSeperator
+  {
+    Ctk.LayerActor seperator_background;
+    int            old_width;
+    int            old_height;
+
+    private override void
+    paint ()
+    {
+      this.seperator_background.paint ();
+    }
+
+    public override void
+    get_preferred_height (float     for_width,
+                          out float min_height_p,
+                          out float natural_height_p)
+    {
+      min_height_p = (float) Ctk.em_to_pixel (GAP);
+      natural_height_p = min_height_p;
+    }
+
+    public override void
+    get_preferred_width (float for_height,
+                         out float min_width_p,
+                         out float natural_width_p)
+    {
+      min_width_p = (float) Ctk.em_to_pixel (2 * MARGIN);
+      natural_width_p = min_width_p;
+    }
+
+    private override void
+    allocate (Clutter.ActorBox        box,
+              Clutter.AllocationFlags flags)
+    {
+      int w;
+      int h;
+
+      base.allocate (box, flags);
+      w = (int) (box.x2 - box.x1);
+      h = (int) (box.y2 - box.y1);
+
+      // exit early if the allocation-width/height didn't change, this is needed
+      // because clutter triggers calling allocate even if nothing changed
+      if ((old_width == w) && (old_height == h))
+        return;
+
+      this.seperator_background = new Ctk.LayerActor (w, h);
+
+      Ctk.Layer layer = new Ctk.Layer (w,
+                                       h,
+                                       Ctk.LayerRepeatMode.NONE,
+                                       Ctk.LayerRepeatMode.NONE);
+      Cairo.Surface fill_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
+                                                        w,
+                                                        h);
+      Cairo.Surface image_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
+                                                         w,
+                                                         h);
+      Cairo.Context fill_cr = new Cairo.Context (fill_surf);
+      Cairo.Context image_cr = new Cairo.Context (image_surf);
+
+      Unity.QuicklistRendering.Seperator.fill_mask (fill_cr);
+      Unity.QuicklistRendering.Seperator.image_background (image_cr, w, h);
+
+      layer.set_mask_from_surface (fill_surf);
+      layer.set_image_from_surface (image_surf);
+      layer.set_opacity (255);
+
+      this.seperator_background.add_layer (layer);
+
+      //this.set_background (this.seperator_background);
+      this.seperator_background.set_opacity (255);
+
+      this.seperator_background.set_parent (this);
+      this.seperator_background.map ();
+      this.seperator_background.show ();
+    }
+
+    construct
+    {
+      Ctk.Padding padding = Ctk.Padding () {
+        left   = (int) Ctk.em_to_pixel (MARGIN),
+        right  = (int) Ctk.em_to_pixel (MARGIN),
+        top    = (int) Ctk.em_to_pixel (MARGIN),
+        bottom = (int) Ctk.em_to_pixel (MARGIN)
+      };
+      this.set_padding (padding);
+
+      old_width  = 0;
+      old_height = 0;
+    }
+  }
+}
 
=== modified file 'unity-private/launcher/quicklist-view.vala'
--- unity-private/launcher/quicklist-view.vala	2010-06-30 14:23:06 +0000
+++ unity-private/launcher/quicklist-view.vala	2010-07-14 16:07:41 +0000
@@ -39,305 +39,6 @@
   const float ANCHOR_WIDTH           = 0.75f;
   const float ANCHOR_WIDTH_ABS       = 10.0f;
 
-  // we subclass Ctk.MenuSeperator here because we need to adapt it's appearance
-  public class QuicklistMenuSeperator : Ctk.MenuSeperator
-  {
-    Ctk.LayerActor seperator_background;
-    int            old_width;
-    int            old_height;
-
-    private override void
-    paint ()
-    {
-      this.seperator_background.paint ();
-    }
-
-    public override void
-    get_preferred_height (float     for_width,
-                          out float min_height_p,
-                          out float natural_height_p)
-    {
-      min_height_p = (float) Ctk.em_to_pixel (GAP);
-      natural_height_p = min_height_p;
-    }
-
-    public override void
-    get_preferred_width (float for_height,
-                         out float min_width_p,
-                         out float natural_width_p)
-    {
-      min_width_p = (float) Ctk.em_to_pixel (2 * MARGIN);
-      natural_width_p = min_width_p;
-    }
-
-    private override void
-    allocate (Clutter.ActorBox        box,
-              Clutter.AllocationFlags flags)
-    {
-      int w;
-      int h;
-
-      base.allocate (box, flags);
-      w = (int) (box.x2 - box.x1);
-      h = (int) (box.y2 - box.y1);
-
-      // exit early if the allocation-width/height didn't change, this is needed
-      // because clutter triggers calling allocate even if nothing changed
-      if ((old_width == w) && (old_height == h))
-        return;
-
-      // before creating a new CtkLayerActor make sure we don't leak any memory
-      if (this.seperator_background is Ctk.LayerActor)
-        this.seperator_background.destroy ();
-
-      this.seperator_background = new Ctk.LayerActor (w, h);
-
-      Ctk.Layer layer = new Ctk.Layer (w,
-                                       h,
-                                       Ctk.LayerRepeatMode.NONE,
-                                       Ctk.LayerRepeatMode.NONE);
-      Cairo.Surface fill_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
-                                                        w,
-                                                        h);
-      Cairo.Surface image_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
-                                                         w,
-                                                         h);
-      Cairo.Context fill_cr = new Cairo.Context (fill_surf);
-      Cairo.Context image_cr = new Cairo.Context (image_surf);
-
-      Unity.QuicklistRendering.Seperator.fill_mask (fill_cr);
-      Unity.QuicklistRendering.Seperator.image_background (image_cr, w, h);
-
-      layer.set_mask_from_surface (fill_surf);
-      layer.set_image_from_surface (image_surf);
-      layer.set_opacity (255);
-
-      this.seperator_background.add_layer (layer);
-
-      //this.set_background (this.seperator_background);
-      this.seperator_background.set_opacity (255);
-
-      this.seperator_background.set_parent (this);
-      this.seperator_background.map ();
-      this.seperator_background.show ();
-    }
-
-    construct
-    {
-      Ctk.Padding padding = Ctk.Padding () {
-        left   = (int) Ctk.em_to_pixel (MARGIN),
-        right  = (int) Ctk.em_to_pixel (MARGIN),
-        top    = (int) Ctk.em_to_pixel (MARGIN),
-        bottom = (int) Ctk.em_to_pixel (MARGIN)
-      };
-      this.set_padding (padding);
-
-      old_width  = 0;
-      old_height = 0;
-    }
-  }
-
-  // we subclass Ctk.MenuItem here because we need to adapt it's appearance
-  public class QuicklistMenuItem : Ctk.Actor
-  {
-    Ctk.LayerActor item_background;
-    int            old_width;
-    int            old_height;
-    string         old_label;
-
-    private override void
-    paint ()
-    {
-      this.item_background.paint ();
-    }
-
-    public override void
-    get_preferred_height (float     for_width,
-                          out float min_height_p,
-                          out float natural_height_p)
-    {
-      min_height_p = (float) Ctk.em_to_pixel (ITEM_HEIGHT);
-      natural_height_p = min_height_p;
-    }
-
-    public override void
-    get_preferred_width (float for_height,
-                         out float min_width_p,
-                         out float natural_width_p)
-    {
-      int width;
-      int height;
-      Gtk.Settings settings = Gtk.Settings.get_default ();
-      Unity.QuicklistRendering.Item.get_text_extents (settings.gtk_font_name,
-                                                      this.label,
-                                                      out width,
-                                                      out height);
-      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
-      natural_width_p = min_width_p;
-    }
-
-    private override void
-    allocate (Clutter.ActorBox        box,
-              Clutter.AllocationFlags flags)
-    {
-      int w;
-      int h;
-      Clutter.Color white_color = Clutter.Color () {
-        red   = 255,
-        green = 255,
-        blue  = 255,
-        alpha = 255
-      };
-
-      base.allocate (box, flags);
-
-      w = (int) (box.x2 - box.x1);
-      h = (int) (box.y2 - box.y1);
-
-      // exit early if the allocation-width/height didn't change, this is needed
-      // because clutter triggers calling allocate even if nothing changed
-      if ((old_width == w) && (old_height == h))
-        return;
-
-      // store the new width/height
-      old_width  = w;
-      old_height = h;
-
-      // before creating a new CtkLayerActor make sure we don't leak any memory
-      if (this.item_background is Ctk.LayerActor)
-         this.item_background.unparent ();
-      this.item_background = new Ctk.LayerActor (w, h);
-
-      Ctk.Layer normal_layer = new Ctk.Layer (w,
-                                              h,
-                                              Ctk.LayerRepeatMode.NONE,
-                                              Ctk.LayerRepeatMode.NONE);
-      Ctk.Layer selected_layer = new Ctk.Layer (w,
-                                                h,
-                                                Ctk.LayerRepeatMode.NONE,
-                                                Ctk.LayerRepeatMode.NONE);
-
-      Cairo.Surface normal_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
-                                                          w,
-                                                          h);
-      Cairo.Surface selected_surf = new Cairo.ImageSurface (Cairo.Format.ARGB32,
-                                                            w,
-                                                            h);
-
-      Cairo.Context normal_cr = new Cairo.Context (normal_surf);
-      Cairo.Context selected_cr = new Cairo.Context (selected_surf);
-      Gtk.Settings settings = Gtk.Settings.get_default ();
-
-      Unity.QuicklistRendering.Item.normal_mask (normal_cr,
-                                                 w,
-                                                 h,
-                                                 settings.gtk_font_name,
-                                                 this.label);
-      Unity.QuicklistRendering.Item.selected_mask (selected_cr,
-                                                   w,
-                                                   h,
-                                                   settings.gtk_font_name,
-                                                   this.label);
-
-      normal_layer.set_mask_from_surface (normal_surf);
-      normal_layer.set_color (white_color);
-
-      selected_layer.set_mask_from_surface (selected_surf);
-      selected_layer.set_color (white_color);
-
-      this.item_background.add_layer (normal_layer);
-      this.item_background.add_layer (selected_layer);
-
-      this.item_background.get_layer(0).set_enabled (true);
-      this.item_background.get_layer(1).set_enabled (false);
-      this.item_background.do_queue_redraw ();
-
-      this.item_background.set_parent (this);
-      this.item_background.map ();
-      this.item_background.show ();
-    }
-
-    private bool _on_enter (Clutter.Event event)
-      requires (this is QuicklistMenuItem)
-    {
-      this.item_background.get_layer(0).set_enabled (false);
-      this.item_background.get_layer(1).set_enabled (true);
-      
-      // Ensure we are associated with a stage before queuing a draw to
-      // avoid a rather annoying (but rare) crash in clutter
-      if (this.get_stage () is Clutter.Stage)
-        this.do_queue_redraw ();
-      return false;
-    }
-
-    private bool _on_leave (Clutter.Event event)
-      requires (this is QuicklistMenuItem)
-    {
-      this.item_background.get_layer(0).set_enabled (true);
-      this.item_background.get_layer(1).set_enabled (false);
-      if (this.get_stage () is Clutter.Stage)
-        this.do_queue_redraw ();
-      return false;
-    }
-
-    private void _on_label_changed ()
-    {
-      // if the contents of the label didn't really change exit early
-      if (old_label == this.label)
-        return;
-
-      old_label = this.label;
-    }
-
-    public signal void activated ();
-    public string label {get; construct;}
-
-    private bool _on_mouse_down (Clutter.Event event)
-    {
-      this.notify["label"].disconnect (this._on_label_changed);
-      this.enter_event.disconnect (this._on_enter);
-      this.leave_event.disconnect (this._on_leave);
-      this.button_press_event.disconnect (this._on_mouse_down);
-      this.activated ();
-      return true;
-    }
-
-    public QuicklistMenuItem (string label)
-    {
-      Object (label:label);
-    }
-
-    ~QuicklistMenuItem ()
-    {
-      this.notify["label"].disconnect (this._on_label_changed);
-      this.enter_event.disconnect (this._on_enter);
-      this.leave_event.disconnect (this._on_leave);
-      this.button_press_event.disconnect (this._on_mouse_down);
-    }
-
-    construct
-    {
-      Ctk.Padding padding = Ctk.Padding () {
-        left   = (int) Ctk.em_to_pixel (MARGIN),
-        right  = (int) Ctk.em_to_pixel (MARGIN),
-        top    = (int) Ctk.em_to_pixel (MARGIN),
-        bottom = (int) Ctk.em_to_pixel (MARGIN)
-      };
-      this.set_padding (padding);
-
-      this.notify["label"].connect (this._on_label_changed);
-      this.enter_event.connect (this._on_enter);
-      this.leave_event.connect (this._on_leave);
-      this.button_press_event.connect (this._on_mouse_down);
-
-      this.reactive = true;
-
-      old_width  = 0;
-      old_height = 0;
-      old_label  = "";
-    }
-  }
-
   // we call this instead of Ctk.Menu so you can alter this to look right
   public class QuicklistMenu : Ctk.Menu
   {
 
=== modified file 'unity-private/launcher/scrollerchild-controller.vala'
--- unity-private/launcher/scrollerchild-controller.vala	2010-06-24 11:22:50 +0000
+++ unity-private/launcher/scrollerchild-controller.vala	2010-07-14 16:07:41 +0000
@@ -47,6 +47,8 @@
     protected float click_start_pos = 0.0f;
     protected int drag_sensitivity = 7;
 
+    protected QuicklistController? menu {get; set;}
+
     public ScrollerChildController (ScrollerChild child_)
     {
       Object (child: child_);
@@ -70,7 +72,13 @@
 
     public abstract Gee.ArrayList<ShortcutItem> get_menu_shortcuts ();
     public abstract Gee.ArrayList<ShortcutItem> get_menu_shortcut_actions ();
+
+    public delegate void menu_cb (Dbusmenu.Menuitem? menu);
+    public abstract void get_menu_actions (menu_cb callback);
+    public abstract void get_menu_navigation (menu_cb callback);
+
     public abstract void activate ();
+    public abstract QuicklistController get_menu_controller ();
 
     private bool on_leave_event (Clutter.Event event)
     {
@@ -110,11 +118,14 @@
           button_down == true &&
           event.button.time - last_press_time < 500)
         {
-          var controller = QuicklistController.get_default ();
-          if (controller.is_in_label || controller.menu_is_open ())
-          {
-            controller.close_menu ();
-          }
+          if (menu is QuicklistController)
+            {
+              if (menu.state == QuicklistControllerState.LABEL ||
+                  menu.state == QuicklistControllerState.MENU)
+              {
+                menu.state = QuicklistControllerState.CLOSED;
+              }
+            }
 
           activate ();
         }
@@ -134,49 +145,34 @@
       //no tooltips on drag
       if (Unity.Drag.Controller.get_default ().is_dragging) return;
 
-      var controller = QuicklistController.get_default ();
-      if (controller.menu_is_open () && controller.get_attached_actor () != child)
+      if (menu is QuicklistController == false)
+        {
+          menu = get_menu_controller ();
+        }
+
+      if (menu.state == QuicklistControllerState.MENU
+          && QuicklistController.is_menu_open ()
+          && QuicklistController.do_menus_match (menu))
         {
           // there is a menu open already, attach to the destroy so we can
           // re-ensure later
-          controller.menu.destroy.connect (ensure_menu_state);
+          QuicklistController.get_current_menu ().get_view ().destroy.connect (ensure_menu_state);
           return;
         }
 
       if (menu_state == ScrollerChildControllerMenuState.NO_MENU)
         {
-          if (controller.is_in_label || controller.menu_is_open ())
-            {
-              controller.close_menu ();
-            }
+          menu.state = QuicklistControllerState.CLOSED;
         }
 
       if (menu_state == ScrollerChildControllerMenuState.LABEL)
         {
-          if (!controller.menu_is_open ())
-            {
-              if(Unity.Panel.search_entry_has_focus == false)
-                controller.show_label (name, child);
-            }
+          menu.state = QuicklistControllerState.LABEL;
         }
 
       if (menu_state == ScrollerChildControllerMenuState.MENU)
         {
-          if (controller.is_in_label)
-            {
-              Gee.ArrayList<ShortcutItem> shortcuts = get_menu_shortcuts ();
-              Gee.ArrayList<ShortcutItem> actions = get_menu_shortcut_actions ();
-              if (shortcuts.size > 0 || actions.size > 0)
-                {
-                  controller.show_menu (shortcuts,
-                                        actions,
-                                        false);
-                }
-              else
-                {
-                  menu_state = ScrollerChildControllerMenuState.LABEL;
-                }
-            }
+          menu.state = QuicklistControllerState.MENU;
         }
     }
 
 
=== modified file 'unity/Makefile.am'
--- unity/Makefile.am	2010-07-05 21:46:45 +0000
+++ unity/Makefile.am	2010-07-14 16:07:41 +0000
@@ -44,6 +44,7 @@
   --pkg clutter-1.0 \
   --pkg clutk-0.3 \
   --pkg dbus-glib-1 \
+  --pkg Dbusmenu-Glib-0.2 \
   --pkg dee-1.0 \
   --pkg gconf-2.0 \
   --pkg gtk+-2.0 \
 
=== modified file 'vapi/Bamf-0.2.vapi'
--- vapi/Bamf-0.2.vapi	2010-06-17 11:18:16 +0000
+++ vapi/Bamf-0.2.vapi	2010-07-14 16:07:41 +0000
@@ -2,139 +2,140 @@
 
 [CCode (cprefix = "Bamf", lower_case_cprefix = "bamf_")]
 namespace Bamf {
-        [CCode (cheader_filename = "libbamf/libbamf.h")]
-        public class Application : Bamf.View {
-                public weak Bamf.View parent;
-                public Bamf.ApplicationPrivate priv;
-                public unowned string get_application_type ();
-                public unowned string get_desktop_file ();
-                public unowned GLib.List get_windows ();
-                public GLib.Array get_xids ();
-                public signal void window_added (Bamf.View object);
-                public signal void window_removed (Bamf.View object);
-        }
-        [CCode (cheader_filename = "libbamf/libbamf.h")]
-        public class Control : GLib.Object {
-                public weak GLib.Object parent;
-                public Bamf.ControlPrivate priv;
-                public static Bamf.Control get_default ();
-                public void insert_desktop_file (string desktop_file);
-                public void register_application_for_pid (string application, int32 pid);
-                public void register_tab_provider (string path);
-        }
-        [CCode (cheader_filename = "libbamf/libbamf.h")]
-        public class Factory : GLib.Object {
-                public weak GLib.Object parent;
-                public Bamf.FactoryPrivate priv;
-                public static Bamf.Factory get_default ();
-                public Bamf.View view_for_path (string path);
-        }
-        [CCode (cheader_filename = "libbamf/libbamf.h")]
-        public class Matcher : GLib.Object {
-                public weak GLib.Object parent;
-                public Bamf.MatcherPrivate priv;
-                public bool application_is_running (string application);
-                public Bamf.Application get_active_application ();
-                public Bamf.Window get_active_window ();
-                public unowned Bamf.Application get_application_for_xid (uint32 xid);
-                public unowned GLib.List get_applications ();
-                public static unowned Bamf.Matcher get_default ();
-                public unowned GLib.List get_running_applications ();
-                public unowned GLib.List get_tabs ();
-                public GLib.Array get_xids_for_application (string application);
-                public signal void active_application_changed (GLib.Object object, GLib.Object p0);
-                public signal void active_window_changed (GLib.Object object, GLib.Object p0);
-                public signal void view_closed (GLib.Object object);
-                public signal void view_opened (GLib.Object object);
-        }
-        [CCode (cheader_filename = "libbamf/libbamf.h")]
-        public class Tab : Bamf.View {
-                public weak Bamf.View parent;
-                public Bamf.TabPrivate priv;
-                [CCode (has_construct_function = false)]
-                public Tab (owned string id, owned string uri);
-                public string get_id ();
-                public string get_preview ();
-                public string get_uri ();
-                public void set_preview (owned string uri);
-                public void set_uri (owned string uri);
-                public virtual void show ();
-                public string id { get; set construct; }
-                public string preview { get; set; }
-                public string uri { get; set construct; }
-                public signal void preview_updated ();
-                public signal void uri_changed (string object, string p0);
-        }
-        [CCode (cheader_filename = "libbamf/libbamf.h")]
-        public class TabSource : GLib.Object {
-                public weak GLib.Object parent;
-                public Bamf.TabSourcePrivate priv;
-                public string[] get_tab_ids ();
-                public GLib.Array get_tab_preview (owned string tab_id);
-                public string get_tab_uri (owned string tab_id);
-                public uint32 get_tab_xid (owned string tab_id);
-                public virtual void show_tab (owned string tab_id);
-                public virtual string[] tab_ids ();
-                public virtual GLib.Array tab_preview (owned string tab_id);
-                public virtual string tab_uri (owned string tab_id);
-                public virtual uint32 tab_xid (owned string tab_id);
-                public string id { get; set construct; }
-                public signal void tab_closed (string object);
-                public signal void tab_opened (string object);
-                public signal void tab_uri_changed (string object, string p0, string p1);
-        }
-        [CCode (cheader_filename = "libbamf/libbamf.h")]
-        public class View : GLib.Object {
-                public weak GLib.Object parent;
-                public Bamf.ViewPrivate priv;
-                public virtual GLib.List get_children ();
-                public virtual string get_icon ();
-                public virtual string get_name ();
-                public string get_view_type ();
-                public virtual bool is_active ();
-                public virtual bool is_running ();
-                public virtual bool is_urgent ();
-                public bool user_visible ();
-                public virtual string view_type ();
-                public string path { get; set construct; }
-                public signal void active_changed (bool object);
-                public signal void child_added (Bamf.View object);
-                public signal void child_removed (Bamf.View object);
-                public signal void closed ();
-                public signal void running_changed (bool object);
-                public signal void urgent_changed (bool object);
-                public signal void user_visible_changed (bool object);
-        }
-        [CCode (cheader_filename = "libbamf/libbamf.h")]
-        public class Window : Bamf.View {
-                public weak Bamf.View parent;
-                public Bamf.WindowPrivate priv;
-                public Bamf.Window get_transient ();
-                public uint32 get_xid ();
-                public time_t last_active ();
-        }
-        [CCode (type_id = "BAMF_TYPE_APPLICATION_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
-        public struct ApplicationPrivate {
-        }
-        [CCode (type_id = "BAMF_TYPE_CONTROL_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
-        public struct ControlPrivate {
-        }
-        [CCode (type_id = "BAMF_TYPE_FACTORY_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
-        public struct FactoryPrivate {
-        }
-        [CCode (type_id = "BAMF_TYPE_MATCHER_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
-        public struct MatcherPrivate {
-        }
-        [CCode (type_id = "BAMF_TYPE_TAB_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
-        public struct TabPrivate {
-        }
-        [CCode (type_id = "BAMF_TYPE_TAB_SOURCE_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
-        public struct TabSourcePrivate {
-        }
-        [CCode (type_id = "BAMF_TYPE_VIEW_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
-        public struct ViewPrivate {
-        }
-        [CCode (type_id = "BAMF_TYPE_WINDOW_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
-        public struct WindowPrivate {
-        }
+	[CCode (cheader_filename = "libbamf/libbamf.h")]
+	public class Application : Bamf.View {
+		public weak Bamf.View parent;
+		public Bamf.ApplicationPrivate priv;
+		public unowned string get_application_type ();
+		public unowned string get_desktop_file ();
+		public unowned GLib.List<weak Bamf.Window> get_windows ();
+		public GLib.Array get_xids ();
+		public signal void window_added (Bamf.View object);
+		public signal void window_removed (Bamf.View object);
+	}
+	[CCode (cheader_filename = "libbamf/libbamf.h")]
+	public class Control : GLib.Object {
+		public weak GLib.Object parent;
+		public Bamf.ControlPrivate priv;
+		public static Bamf.Control get_default ();
+		public void insert_desktop_file (string desktop_file);
+		public void register_application_for_pid (string application, int32 pid);
+		public void register_tab_provider (string path);
+	}
+	[CCode (cheader_filename = "libbamf/libbamf.h")]
+	public class Indicator : Bamf.View {
+		public weak Bamf.View parent;
+		public Bamf.IndicatorPrivate priv;
+		public unowned string get_dbus_menu_path ();
+		public unowned string get_remote_address ();
+		public unowned string get_remote_path ();
+	}
+	[CCode (cheader_filename = "libbamf/libbamf.h")]
+	public class Matcher : GLib.Object {
+		public weak GLib.Object parent;
+		public Bamf.MatcherPrivate priv;
+		public bool application_is_running (string application);
+		public Bamf.Application get_active_application ();
+		public Bamf.Window get_active_window ();
+		public Bamf.Application get_application_for_xid (uint32 xid);
+		public GLib.List<weak uint32> get_applications ();
+		public static unowned Bamf.Matcher get_default ();
+		public GLib.List<weak Bamf.Application> get_running_applications ();
+		public GLib.List<weak Bamf.View> get_tabs ();
+		public GLib.Array get_xids_for_application (string application);
+		public signal void active_application_changed (GLib.Object object, GLib.Object p0);
+		public signal void active_window_changed (GLib.Object object, GLib.Object p0);
+		public signal void view_closed (GLib.Object object);
+		public signal void view_opened (GLib.Object object);
+	}
+	[CCode (cheader_filename = "libbamf/libbamf.h")]
+	public class Tab : Bamf.View {
+		public weak Bamf.View parent;
+		public Bamf.TabPrivate priv;
+		[CCode (has_construct_function = false)]
+		public Tab (owned string id, owned string uri);
+		public string get_id ();
+		public string get_preview ();
+		public string get_uri ();
+		public void set_preview (owned string uri);
+		public void set_uri (owned string uri);
+		public virtual void show ();
+		public string id { get; set construct; }
+		public string preview { get; set; }
+		public string uri { get; set construct; }
+		public signal void preview_updated ();
+		public signal void uri_changed (string object, string p0);
+	}
+	[CCode (cheader_filename = "libbamf/libbamf.h")]
+	public class TabSource : GLib.Object {
+		public weak GLib.Object parent;
+		public Bamf.TabSourcePrivate priv;
+		public string[] get_tab_ids ();
+		public GLib.Array get_tab_preview (owned string tab_id);
+		public string get_tab_uri (owned string tab_id);
+		public uint32 get_tab_xid (owned string tab_id);
+		public virtual void show_tab (owned string tab_id);
+		public virtual string[] tab_ids ();
+		public virtual GLib.Array tab_preview (owned string tab_id);
+		public virtual string tab_uri (owned string tab_id);
+		public virtual uint32 tab_xid (owned string tab_id);
+		public string id { get; set construct; }
+		public signal void tab_closed (string object);
+		public signal void tab_opened (string object);
+		public signal void tab_uri_changed (string object, string p0, string p1);
+	}
+	[CCode (cheader_filename = "libbamf/libbamf.h")]
+	public class View : GLib.Object {
+		public weak GLib.Object parent;
+		public Bamf.ViewPrivate priv;
+		public virtual GLib.List get_children ();
+		public virtual string get_icon ();
+		public virtual string get_name ();
+		public string get_view_type ();
+		public virtual bool is_active ();
+		public virtual bool is_running ();
+		public virtual bool is_urgent ();
+		public bool user_visible ();
+		public virtual unowned string view_type ();
+		public string path { get; set construct; }
+		public signal void active_changed (bool object);
+		public signal void child_added (Bamf.View object);
+		public signal void child_removed (Bamf.View object);
+		public signal void closed ();
+		public signal void running_changed (bool object);
+		public signal void urgent_changed (bool object);
+		public signal void user_visible_changed (bool object);
+	}
+	[CCode (cheader_filename = "libbamf/libbamf.h")]
+	public class Window : Bamf.View {
+		public weak Bamf.View parent;
+		public Bamf.WindowPrivate priv;
+		public Bamf.Window get_transient ();
+		public uint32 get_xid ();
+		public time_t last_active ();
+	}
+	[CCode (type_id = "BAMF_TYPE_APPLICATION_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
+	public struct ApplicationPrivate {
+	}
+	[CCode (type_id = "BAMF_TYPE_CONTROL_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
+	public struct ControlPrivate {
+	}
+	[CCode (type_id = "BAMF_TYPE_INDICATOR_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
+	public struct IndicatorPrivate {
+	}
+	[CCode (type_id = "BAMF_TYPE_MATCHER_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
+	public struct MatcherPrivate {
+	}
+	[CCode (type_id = "BAMF_TYPE_TAB_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
+	public struct TabPrivate {
+	}
+	[CCode (type_id = "BAMF_TYPE_TAB_SOURCE_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
+	public struct TabSourcePrivate {
+	}
+	[CCode (type_id = "BAMF_TYPE_VIEW_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
+	public struct ViewPrivate {
+	}
+	[CCode (type_id = "BAMF_TYPE_WINDOW_PRIVATE", cheader_filename = "libbamf/libbamf.h")]
+	public struct WindowPrivate {
+	}
 }
 
=== added file 'vapi/Dbusmenu-Glib-0.2.vapi'
--- vapi/Dbusmenu-Glib-0.2.vapi	1970-01-01 00:00:00 +0000
+++ vapi/Dbusmenu-Glib-0.2.vapi	2010-07-14 16:07:41 +0000
@@ -0,0 +1,173 @@
+/* Dbusmenu-Glib-0.2.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "Dbusmenu", lower_case_cprefix = "dbusmenu_")]
+namespace Dbusmenu {
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public class Client : GLib.Object {
+		public weak GLib.Object parent;
+		[CCode (has_construct_function = false)]
+		public Client (string name, string object);
+		public bool add_type_handler (string type, Dbusmenu.ClientTypeHandler newfunc);
+		public Dbusmenu.Menuitem get_root ();
+		public void send_about_to_show (int id, void* cb, void* cb_data);
+		public void send_event (int id, string name, GLib.Value value, uint timestamp);
+		public string dbus_name { get; construct; }
+		public string dbus_object { get; construct; }
+		public signal void layout_updated ();
+		public signal void new_menuitem (GLib.Object object);
+		public signal void root_changed (GLib.Object object);
+	}
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public class Menuitem : GLib.Object {
+		public weak GLib.Object parent;
+		[CCode (has_construct_function = false)]
+		public Menuitem ();
+		public bool child_add_position (Dbusmenu.Menuitem child, uint position);
+		public bool child_append (Dbusmenu.Menuitem child);
+		public bool child_delete (Dbusmenu.Menuitem child);
+		public Dbusmenu.Menuitem child_find (int id);
+		public bool child_prepend (Dbusmenu.Menuitem child);
+		public bool child_reorder (Dbusmenu.Menuitem child, uint position);
+		public Dbusmenu.Menuitem find_id (int id);
+		public void @foreach (void* func, void* data);
+		public unowned GLib.List get_children ();
+		public int get_id ();
+		public uint get_position (Dbusmenu.Menuitem parent);
+		public uint get_position_realized (Dbusmenu.Menuitem parent);
+		public bool get_root ();
+		public virtual void handle_event (string name, GLib.Value? value, uint timestamp);
+		public GLib.HashTable properties_copy ();
+		public GLib.List properties_list ();
+		public bool property_exist (string property);
+		public unowned string property_get (string property);
+		public bool property_get_bool (string property);
+		public int property_get_int (string property);
+		public GLib.Value property_get_value (string property);
+		public void property_remove (string property);
+		public bool property_set (string property, string value);
+		public bool property_set_bool (string property, bool value);
+		public bool property_set_int (string property, int value);
+		public bool property_set_value (string property, GLib.Value value);
+		public virtual void send_about_to_show (Dbusmenu.menuitem_about_to_show_cb cb, void* cb_data);
+		public void set_root (bool root);
+		public GLib.List take_children ();
+		[CCode (has_construct_function = false)]
+		public Menuitem.with_id (int id);
+		public int id { get; construct; }
+		public signal void child_added (GLib.Object object, uint p0);
+		public signal void child_moved (GLib.Object object, uint p0, uint p1);
+		public signal void child_removed (GLib.Object object);
+		public signal void item_activated (uint object);
+		public signal void property_changed (string property_name, void* value);
+		public signal void realized ();
+	}
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public class MenuitemProxy : Dbusmenu.Menuitem {
+		public weak Dbusmenu.Menuitem parent;
+		[CCode (has_construct_function = false)]
+		public MenuitemProxy (Dbusmenu.Menuitem mi);
+		public Dbusmenu.Menuitem get_wrapped ();
+		public Dbusmenu.Menuitem menu_item { get; construct; }
+	}
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public class Server : GLib.Object {
+		public weak GLib.Object parent;
+		[CCode (has_construct_function = false)]
+		public Server (string object);
+		public void set_root (Dbusmenu.Menuitem root);
+		public string dbus_object { get; construct; }
+		public Dbusmenu.Menuitem root_node { get; set; }
+		public uint version { get; }
+		public signal void item_property_updated (int object, string p0, GLib.Value p1);
+		public signal void item_updated (int object);
+		public signal void layout_updated (uint object, int p0);
+	}
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h", has_target = false)]
+	public delegate bool ClientTypeHandler (Dbusmenu.Menuitem newitem, Dbusmenu.Menuitem parent, Dbusmenu.Client client);
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h", has_target = false)]
+	public delegate void menuitem_about_to_show_cb (Dbusmenu.Menuitem mi, void* user_data);
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h", has_target = false)]
+	public delegate void menuitem_buildxml_slot_t (Dbusmenu.Menuitem mi, ref unowned string[] stringarray);
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string CLIENT_PROP_DBUS_NAME;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string CLIENT_PROP_DBUS_OBJECT;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string CLIENT_SIGNAL_LAYOUT_UPDATED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string CLIENT_SIGNAL_NEW_MENUITEM;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string CLIENT_SIGNAL_ROOT_CHANGED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string CLIENT_TYPES_DEFAULT;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string CLIENT_TYPES_IMAGE;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string CLIENT_TYPES_SEPARATOR;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_CHILD_DISPLAY_SUBMENU;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_ICON_NAME_BLANK;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_CHILD_DISPLAY;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_ENABLED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_ICON_DATA;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_ICON_NAME;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_LABEL;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_SHORTCUT;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_TOGGLE_STATE;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_TOGGLE_TYPE;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_TYPE;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_PROP_VISIBLE;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SHORTCUT_ALT;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SHORTCUT_CONTROL;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SHORTCUT_SHIFT;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SHORTCUT_SUPER;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SIGNAL_CHILD_ADDED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SIGNAL_CHILD_MOVED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SIGNAL_CHILD_REMOVED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SIGNAL_ITEM_ACTIVATED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SIGNAL_PROPERTY_CHANGED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_SIGNAL_REALIZED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_TOGGLE_CHECK;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string MENUITEM_TOGGLE_RADIO;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const int MENUITEM_TOGGLE_STATE_CHECKED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const int MENUITEM_TOGGLE_STATE_UNCHECKED;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const int MENUITEM_TOGGLE_STATE_UNKNOWN;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string SERVER_PROP_DBUS_OBJECT;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string SERVER_PROP_ROOT_NODE;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string SERVER_PROP_VERSION;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string SERVER_SIGNAL_ID_PROP_UPDATE;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string SERVER_SIGNAL_ID_UPDATE;
+	[CCode (cheader_filename = "libdbusmenu-glib/client.h,libdbusmenu-glib/menuitem-proxy.h,libdbusmenu-glib/menuitem.h,libdbusmenu-glib/server.h")]
+	public const string SERVER_SIGNAL_LAYOUT_UPDATED;
+}
 
=== modified file 'vapi/clutk-0.3.vapi'
--- vapi/clutk-0.3.vapi	2010-07-06 16:13:23 +0000
+++ vapi/clutk-0.3.vapi	2010-07-14 16:07:41 +0000
@@ -85,6 +85,20 @@
 		public virtual signal void show_context_menu (uint event_time);
 	}
 	[CCode (cheader_filename = "clutk/clutk.h")]
+	public class CheckMenuItem : Ctk.MenuItem, Clutter.Scriptable, Ctk.Focusable, Clutter.Container {
+		[CCode (has_construct_function = false)]
+		public CheckMenuItem ();
+		public bool get_active ();
+		public bool get_inconsistent ();
+		public void set_active (bool is_active);
+		public void set_inconsistent (bool setting);
+		[CCode (has_construct_function = false)]
+		public CheckMenuItem.with_label (string label);
+		public bool active { get; set; }
+		public bool inconsistent { get; set; }
+		public virtual signal void toggled ();
+	}
+	[CCode (cheader_filename = "clutk/clutk.h")]
 	public class Effect : GLib.InitiallyUnowned {
 		public unowned Clutter.Animation animate (ulong mode, uint duration, ...);
 		public unowned Clutter.Actor get_actor ();
@@ -212,6 +226,16 @@
 		public string stock_id { owned get; set; }
 	}
 	[CCode (cheader_filename = "clutk/clutk.h")]
+	public class ImageMenuItem : Ctk.MenuItem, Clutter.Scriptable, Ctk.Focusable, Clutter.Container {
+		[CCode (has_construct_function = false)]
+		public ImageMenuItem ();
+		public unowned Gdk.Pixbuf get_image ();
+		public void set_image (Gdk.Pixbuf pixbuf);
+		[CCode (has_construct_function = false)]
+		public ImageMenuItem.with_label (string label);
+		public Gdk.Pixbuf image { get; set; }
+	}
+	[CCode (cheader_filename = "clutk/clutk.h")]
 	public class Layer : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Layer (uint width, uint height, Ctk.LayerRepeatMode image_repeat, Ctk.LayerRepeatMode mask_repeat);
@@ -318,11 +342,39 @@
 		public virtual signal void activated ();
 	}
 	[CCode (cheader_filename = "clutk/clutk.h")]
-	public class MenuSeperator : Ctk.Actor, Clutter.Scriptable, Ctk.Focusable {
+	public class MenuSeperator : Ctk.MenuItem, Clutter.Scriptable, Ctk.Focusable, Clutter.Container {
 		[CCode (has_construct_function = false)]
 		public MenuSeperator ();
 	}
 	[Compact]
+	[CCode (cheader_filename = "clutk/clutk.h")]
+	public class ProjectedTextureVertex {
+		public Cogl.Color color;
+		public float q;
+		public float r;
+		public float s;
+		public float t;
+		public float w;
+		public float x;
+		public float y;
+		public float z;
+	}
+	[CCode (cheader_filename = "clutk/clutk.h")]
+	public class RadioMenuItem : Ctk.CheckMenuItem, Clutter.Scriptable, Ctk.Focusable, Clutter.Container {
+		[CCode (has_construct_function = false)]
+		public RadioMenuItem (GLib.SList group);
+		public unowned GLib.SList get_group ();
+		public void set_group (GLib.SList group);
+		[CCode (has_construct_function = false)]
+		public RadioMenuItem.with_label (GLib.SList group, string label);
+		public void* group { get; set; }
+		public virtual signal void group_changed ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "clutk/clutk.h")]
+	public class RadioMenuItemClass {
+	}
+	[Compact]
 	[CCode (type_id = "CTK_TYPE_RENDER_TARGET", cheader_filename = "clutk/clutk.h")]
 	public class RenderTarget {
 		[CCode (has_construct_function = false)]
@@ -511,5 +563,7 @@
 	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static double pixel_to_em (int pixel_value);
 	[CCode (cheader_filename = "clutk/clutk.h")]
+	public static void render_projected_polygon (Ctk.ProjectedTextureVertex V, uint tex_id, int window_w, int window_h);
+	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static void surface_blur (Cairo.Surface surface, uint radius);
 }
 
=== modified file 'vapi/indicator.vapi'
--- vapi/indicator.vapi	2010-06-03 17:13:55 +0000
+++ vapi/indicator.vapi	2010-07-14 16:07:41 +0000
@@ -2,11 +2,12 @@
 
 [CCode (cprefix = "Indicator", lower_case_cprefix = "indicator_")]
 namespace Indicator {
-	[CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+	[CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h,libindicator/indicator-desktop-shortcuts.h")]
 	public class DesktopShortcuts : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public DesktopShortcuts (string file, string identity);
-		public unowned string get_nicks ();
+    [CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_nicks ();
 		public bool nick_exec (string nick);
 		public unowned string nick_get_name (string nick);
 		public string desktop_file { construct; }