Merge lp:~alexlauni/unity/state-introspection into lp:unity

[Alex Launi]

Implements a debugging interface to get a snapshot of what Unity's internal data structures contain.

[Neil J. Patel (njpatel)]

Overall looks great, there are some fixes needed, though:

- Use copyright headers from the other files, should be GPLv3 (no later), (C) Canonical and Authored by: You.

- /com/canonical not /org/canonical, same for org.canoni....

- g_error_free after printing the error

- static void Hello() not
  static void
  Hello ()

- Does initStateIntrospection need to be it's own function? Can't be done in the constructor of StateIntrospectionDBusInterface?

- Style:
  - AddChild not addChild
  - 2sp indenting
  - parenthesis on new line

Re: Style, sorry this isn't more obvious, I'll make sure to clean up the existing code and make a note in the source too. You can use `astyle -s2 -b -S -N -w -Y -M80 -p -H -d -j -k3 -n -z2` to update the style of the code to the correct one (apart from function names, of course).

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

In have a few comments in addition to what Neil said. But generally
nice work Alex :-)

> === added file 'src/Introspectable.cpp'
> SNIP
> +Introspectable::introspect ()
> +{
> +       GVariant                *result;
> +       GVariant        *childResults;
> +       GVariantBuilder *builder;
> +
> +       builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
> +       for (std::list<Introspectable*>::iterator it = _children.begin (); it != _children.end (); it++) {
> +               g_variant_builder_add (builder, "{sv}", (*it)->getName (), (*it)->introspect ());
> +       }
> +       addProperties (builder);
> +
> +       childResults = g_variant_new ("(a{sv})", builder);
> +       g_variant_builder_unref (builder);
> +
> +       if (_children.size () > 0) {
> +               builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
> +               g_variant_builder_add (builder, "{sv}", getName (), childResults);
> +               result = g_variant_new ("(a{sv})", builder);
> +               g_variant_builder_unref (builder);
> +
> +               return result;
> +       }
> +
> +       return childResults;
> +}

You can use a stack allocated GVariantBuilder here to simplify the
code somewhat. You rarely need heap allocated ones.

> === added file 'src/StateIntrospectionDBusInterface.cpp'
> +void
> +StateIntrospectionDBusInterface::initStateIntrospection ()
> +{
> +    _owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
> +                               UNITY_STATE_DEBUG_BUS_NAME,
> +                               G_BUS_NAME_OWNER_FLAGS_NONE,
> +                               &StateIntrospectionDBusInterface::onBusAcquired,
> +                               &StateIntrospectionDBusInterface::onNameAcquired,
> +                               &StateIntrospectionDBusInterface::onNameLost,
> +                               this,
> +                               NULL);
> +
> +}

I don't think we need to own a particular name on the bus for
debugging. We should probably assume that Unity owns the
com.canonical.Unity name and just let the rest be object hierarchies
below that name. Neil?

> +void
> +StateIntrospectionDBusInterface::dBusMethodCall (GDBusConnection *connection,
> +                                                 const gchar *sender,
> +                                                 const gchar *objectPath,
> +                                                 const gchar *ifaceName,
> +                                                 const gchar *methodName,
> +                                                 GVariant *parameters,
> +                                                 GDBusMethodInvocation *invocation,
> +                                                 gpointer data)
> +{
> +    if (g_strcmp0 (methodName, "GetState") == 0) {
> +               GVariant *ret;
> +               const gchar *input;
> +        g_variant_get (parameters, "(&s)", &input);
> +
> +               ret = getState (input);
> +        g_dbus_method_invocation_return_value (invocation, ret);
> +               g_variant_unref (ret);
> +    } else {
> +        g_dbus_method_invocation_return_dbus_error (invocation, "org.canonical.Unity",
> +...

[Mikkel Kamstrup Erlandsen (kamstrup)]

And two more things :-)

Is it StateIntrospection or just Introspection? I think just
Introspection makes sense, in which case you should probably rename
StateIntrospectionDBusInterface.

I don't think the new files have been added to Makefile.am?

[Neil J. Patel (njpatel)]

RE: DBus, we don't have any one object owning the name right now and I don't plan to add that at least until the week after next, so I think it's okay as it is right now, it would be simple-enough to move to another file once I have that sorted in my head.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Just own/unown com.canonical.Unity from the Compiz plugin load/unload.
There's nothing more to it.

It could possibly just be part of this branch. Alex - can you locate the
Compiz hooks?
On Nov 24, 2010 3:41 PM, "Neil J. Patel" <email address hidden> wrote:
> RE: DBus, we don't have any one object owning the name right now and I
don't plan to add that at least until the week after next, so I think it's
okay as it is right now, it would be simple-enough to move to another file
once I have that sorted in my head.
>
>
> --
>
https://code.launchpad.net/~alexlauni/unity/state-introspection/+merge/41479
> Your team Unity Team is subscribed to branch lp:unity.

[lp:~alexlauni/unity/state-introspection]

622. By Alex Launi on 2010-11-24

Fix copyright in headers

623. By Alex Launi on 2010-11-24

Fix Canonical DBus namespacing

624. By Alex Launi on 2010-11-24

Fix method names

625. By Alex Launi on 2010-11-24

run astyle over my files

626. By Alex Launi on 2010-11-24

free gerror after failing to register bus

627. By Alex Launi on 2010-11-24

Fix compilation

628. By Alex Launi on 2010-11-24

Make DBusMethodCall private

629. By Alex Launi on 2010-11-24

Rename DBus interface from StateIntrospection to Introspection

630. By Alex Launi on 2010-11-24

Add example of property adding to Introspectable.h

631. By Alex Launi on 2010-11-24

A last couple of for s/State//

[Neil J. Patel (njpatel)]

Well, no, 'cos there are some bits and pieces that will depend on that and which I'd like to make testable, and hence I can't keep it tied to the plugin, otherwise I'll just have it to move it from there later. So, seeing as this is done, I'll take this as the lesser of two evils today :)

Approved pending the fix of the conflict with trunk as mentioned on #ayatana.

Nice work, and don't forget to add your name to AUTHORS :)

review: Approve

[lp:~alexlauni/unity/state-introspection]

632. By Alex Launi on 2010-11-24

Merge trunk

=== added file 'src/Introspectable.cpp'
--- src/Introspectable.cpp	1970-01-01 00:00:00 +0000
+++ src/Introspectable.cpp	2010-11-24 17:57:00 +0000
@@ -0,0 +1,61 @@
+/*
+ * 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: Alex Launi <[e-mail]>
+ */
+
+#include "Introspectable.h"
+
+GVariant*
+Introspectable::Introspect ()
+{
+  GVariant		  *result;
+  GVariant        *childResults;
+  GVariantBuilder *builder;
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
+  for (std::list<Introspectable *>::iterator it = _children.begin (); it != _children.end (); it++)
+  {
+    g_variant_builder_add (builder, "{sv}", (*it)->GetName (), (*it)->Introspect () );
+  }
+  AddProperties (builder);
+
+  childResults = g_variant_new ("(a{sv})", builder);
+  g_variant_builder_unref (builder);
+
+  if (_children.size () > 0)
+  {
+    builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}") );
+    g_variant_builder_add (builder, "{sv}", GetName (), childResults);
+    result = g_variant_new ("(a{sv})", builder);
+    g_variant_builder_unref (builder);
+
+    return result;
+  }
+
+  return childResults;
+}
+
+void
+Introspectable::AddChild (Introspectable *child)
+{
+  _children.push_back (child);
+}
+
+void
+Introspectable::RemoveChild (Introspectable *child)
+{
+  _children.remove (child);
+}
\ No newline at end of file

=== added file 'src/Introspectable.h'
--- src/Introspectable.h	1970-01-01 00:00:00 +0000
+++ src/Introspectable.h	2010-11-24 17:57:00 +0000
@@ -0,0 +1,54 @@
+/*
+ * 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: Alex Launi <[e-mail]>
+ */
+
+#ifndef _INTROSPECTABLE_H
+#define _INTROSPECTABLE_H 1
+
+#include <glib.h>
+#include <list>
+
+class Introspectable
+{
+public:
+  GVariant *Introspect ();
+  void AddChild (Introspectable *child);
+  void RemoveChild (Introspectable *child);
+
+protected:
+  virtual const gchar *GetName () = 0;
+  virtual void AddProperties (GVariantBuilder *builder) = 0;
+  /*
+   * AddProperties should be implemented as such ...
+   * void ClassFoo::AddProperties (GVariantBuilder *builder)
+   * {
+   * 	g_variant_builder_add (builder, "{sv}", "label", g_variant_new_string ("_File") );
+   *	g_variant_builder_add (builder, "{sv}", "image", g_variant_new_string ("") );
+   *	g_variant_builder_add (builder, "{sv}", "visible", g_variant_new_boolean (TRUE) );
+   *  	g_variant_builder_add (builder, "{sv}", "sensitive", g_variant_new_boolean (TRUE) );
+   *  	g_variant_builder_add (builder, "{sv}", "active", g_variant_new_boolean (FALSE) );
+   *  	g_variant_builder_add (builder, "{sv}", "label", g_variant_new_int32 (34) );
+   *  	g_variant_builder_add (builder, "{sv}", "label", g_variant_new_int32 (24) );
+   * }
+   * That's all. Just add a bunch of key-value properties to the builder.
+   */
+
+private:
+  std::list<Introspectable *> _children;
+};
+
+#endif
\ No newline at end of file

=== added file 'src/IntrospectionDBusInterface.cpp'
--- src/IntrospectionDBusInterface.cpp	1970-01-01 00:00:00 +0000
+++ src/IntrospectionDBusInterface.cpp	2010-11-24 17:57:00 +0000
@@ -0,0 +1,223 @@
+/*
+ * 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: Alex Launi <[e-mail]>
+ */
+
+#include "IntrospectionDBusInterface.h"
+
+#define UNITY_STATE_DEBUG_BUS_NAME "com.canonical.Unity.Debug"
+
+void DBusMethodCall (GDBusConnection*, const gchar*, const gchar*,
+					 const gchar*, const gchar*, GVariant*,
+					 GDBusMethodInvocation*, gpointer);
+GVariant* GetState (const gchar*);
+
+static const GDBusInterfaceVTable si_vtable =
+{
+  &DBusMethodCall,
+  NULL,
+  NULL
+};
+
+static const GDBusArgInfo si_getstate_in_args =
+{
+  -1,
+  "piece",
+  "s",
+  NULL
+};
+static const GDBusArgInfo *const si_getstate_in_arg_pointers[] = { &si_getstate_in_args, NULL };
+
+// TODO: this is really a a{sv} or something like that.
+static const GDBusArgInfo si_getstate_out_args =
+{
+  -1,
+  "state",
+  "a{sv}",
+  NULL
+};
+static const GDBusArgInfo *const si_getstate_out_arg_pointers[] = { &si_getstate_out_args, NULL };
+
+static const GDBusMethodInfo si_method_info_getstate =
+{
+  -1,
+  "GetState",
+  (GDBusArgInfo **) &si_getstate_in_arg_pointers,
+  (GDBusArgInfo **) &si_getstate_out_arg_pointers,
+  NULL
+};
+
+static const GDBusMethodInfo *const si_method_info_pointers[] = { &si_method_info_getstate, NULL };
+
+static const GDBusInterfaceInfo si_iface_info =
+{
+  -1,
+  "com.canonical.Unity.Debug.Introspection",
+  (GDBusMethodInfo **) &si_method_info_pointers,
+  NULL,
+  NULL,
+  NULL,
+};
+
+static Introspectable      *_introspectable;
+
+IntrospectionDBusInterface::IntrospectionDBusInterface (Introspectable *introspectable)
+{
+  _introspectable = introspectable;
+  _owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+                              UNITY_STATE_DEBUG_BUS_NAME,
+                              G_BUS_NAME_OWNER_FLAGS_NONE,
+                              &IntrospectionDBusInterface::OnBusAcquired,
+                              &IntrospectionDBusInterface::OnNameAcquired,
+                              &IntrospectionDBusInterface::OnNameLost,
+                              this,
+                              NULL);
+}
+
+IntrospectionDBusInterface::~IntrospectionDBusInterface ()
+{
+  g_bus_unown_name (_owner_id);
+}
+
+void 
+IntrospectionDBusInterface::OnBusAcquired (GDBusConnection *connection, const gchar *name, gpointer data)
+{
+  GError *error = NULL;
+  g_dbus_connection_register_object (connection,
+                                     "/com/canonical/Unity/Debug/Introspection",
+                                     (GDBusInterfaceInfo *) &si_iface_info,
+                                     &si_vtable,
+                                     NULL,
+                                     NULL,
+                                     &error);
+  if (error != NULL)
+  {
+    g_warning ("Could not register Introspection object onto d-bus");
+	g_error_free (error);
+  }
+}
+
+void
+IntrospectionDBusInterface::OnNameAcquired (GDBusConnection *connection, const gchar *name, gpointer data)
+{
+}
+
+void
+IntrospectionDBusInterface::OnNameLost (GDBusConnection *connection, const gchar *name, gpointer data)
+{
+}
+
+void
+DBusMethodCall (GDBusConnection *connection,
+                                                 const gchar *sender,
+                                                 const gchar *objectPath,
+                                                 const gchar *ifaceName,
+                                                 const gchar *methodName,
+                                                 GVariant *parameters,
+                                                 GDBusMethodInvocation *invocation,
+                                                 gpointer data)
+{
+  if (g_strcmp0 (methodName, "GetState") == 0)
+  {
+    GVariant *ret;
+    const gchar *input;
+    g_variant_get (parameters, "(&s)", &input);
+
+    ret = GetState (input);
+    g_dbus_method_invocation_return_value (invocation, ret);
+    g_variant_unref (ret);
+  }
+  else
+  {
+    g_dbus_method_invocation_return_dbus_error (invocation, "com.canonical.Unity",
+                                                "Failed to find method");
+  }
+}
+
+GVariant*
+GetState (const gchar *piece)
+{
+  return _introspectable->Introspect ();
+}
+
+/* a very contrived example purely for giving QA something purposes */
+GVariant*
+IntrospectionDBusInterface::BuildFakeReturn ()
+{
+  GVariantBuilder *builder;
+  GVariant *result, *panel_result, *indicators_result, *appmenu_result, *entries_result, *zero_result, *one_result;
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}") );
+  g_variant_builder_add (builder, "{sv}", "label", g_variant_new_string ("_File") );
+  g_variant_builder_add (builder, "{sv}", "image", g_variant_new_string ("") );
+  g_variant_builder_add (builder, "{sv}", "visible", g_variant_new_boolean (TRUE) );
+  g_variant_builder_add (builder, "{sv}", "sensitive", g_variant_new_boolean (TRUE) );
+  g_variant_builder_add (builder, "{sv}", "active", g_variant_new_boolean (FALSE) );
+  g_variant_builder_add (builder, "{sv}", "label", g_variant_new_int32 (34) );
+  g_variant_builder_add (builder, "{sv}", "label", g_variant_new_int32 (24) );
+  zero_result = g_variant_new ("(a{sv})", builder);
+  g_variant_builder_unref (builder);
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}") );
+  g_variant_builder_add (builder, "{sv}", "label", g_variant_new_string ("_Edit") );
+  g_variant_builder_add (builder, "{sv}", "image", g_variant_new_string ("") );
+  g_variant_builder_add (builder, "{sv}", "visible", g_variant_new_boolean (TRUE) );
+  g_variant_builder_add (builder, "{sv}", "sensitive", g_variant_new_boolean (TRUE) );
+  g_variant_builder_add (builder, "{sv}", "active", g_variant_new_boolean (FALSE) );
+  g_variant_builder_add (builder, "{sv}", "label", g_variant_new_int32 (34) );
+  g_variant_builder_add (builder, "{sv}", "label", g_variant_new_int32 (24) );
+  one_result = g_variant_new ("(a{sv})", builder);
+  g_variant_builder_unref (builder);
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}") );
+  g_variant_builder_add (builder, "{sv}", "0", zero_result);
+  g_variant_builder_add (builder, "{sv}", "1", one_result);
+  entries_result = g_variant_new ("(a{sv})", builder);
+  g_variant_builder_unref (builder);
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}") );
+  g_variant_builder_add (builder, "{sv}", "model-name",
+                         g_variant_new_string ("com.canonical.Unity.Panel.Service.Indicators.appmenu.324234243") );
+  g_variant_builder_add (builder, "{sv}", "entries", entries_result);
+  appmenu_result = g_variant_new ("(a{sv})", builder);
+  g_variant_builder_unref (builder);
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}") );
+  g_variant_builder_add (builder, "{sv}", "appmenu", appmenu_result);
+  indicators_result = g_variant_new ("(a{sv})", builder);
+  g_variant_builder_unref (builder);
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}") );
+  g_variant_builder_add (builder, "{sv}", "backend",
+                         g_variant_new_string ("/com/canonical/Unity/Panel/Service/324234243") );
+  g_variant_builder_add (builder, "{sv}", "launch-type",
+                         g_variant_new_string ("dbus") );
+  g_variant_builder_add (builder, "{sv}", "width", g_variant_new_int32 (1024) );
+  g_variant_builder_add (builder, "{sv}", "width", g_variant_new_int32 (32) );
+  g_variant_builder_add (builder, "{sv}", "theme", g_variant_new_string ("gtk") );
+  g_variant_builder_add (builder, "{sv}", "indicators", indicators_result);
+  panel_result = g_variant_new ("(a{sv})", builder);
+  g_variant_builder_unref (builder);
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}") );
+  g_variant_builder_add (builder, "{sv}", "panel", panel_result);
+  result = g_variant_new ("(a{sv})", builder);
+  g_variant_builder_unref (builder);
+
+  gchar *s = g_variant_print (result, TRUE);
+  g_free (s);
+  return result;
+}
\ No newline at end of file

=== added file 'src/IntrospectionDBusInterface.h'
--- src/IntrospectionDBusInterface.h	1970-01-01 00:00:00 +0000
+++ src/IntrospectionDBusInterface.h	2010-11-24 17:57:00 +0000
@@ -0,0 +1,54 @@
+/*
+ * 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: Alex Launi <[e-mail]>
+ */
+
+#ifndef _STATE_INTROSPECTION_DBUS_INTERFACE_H
+#define _STATE_INTROSPECTION_DBUS_INTERFACE_H 1
+
+#include <glib.h>
+#include <gio/gio.h>
+#include "Introspectable.h"
+
+class IntrospectionDBusInterface
+{
+public:
+  IntrospectionDBusInterface  (Introspectable *introspectable);
+  ~IntrospectionDBusInterface ();
+
+  /*static void DBusMethodCall (GDBusConnection *connection, const gchar *sender,
+                              const gchar *objectPath, const gchar *ifaceName,
+                              const gchar *methodName, GVariant *parameters,
+                              GDBusMethodInvocation *invocation, gpointer data);	*/
+
+private:
+  /* methods */
+
+  static void OnBusAcquired (GDBusConnection *connection, const gchar *name, gpointer data);
+
+  static void OnNameAcquired (GDBusConnection *connection, const gchar *name, gpointer data);
+
+  static void OnNameLost (GDBusConnection *connection, const gchar *name, gpointer data);
+
+  //static GVariant *GetState (const char *piece);
+
+  static GVariant *BuildFakeReturn ();
+
+  /* members */
+  guint						_owner_id;
+};
+
+#endif

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2010-11-24 02:13:08 +0000
+++ src/Launcher.cpp	2010-11-24 17:57:00 +0000
@@ -1418,6 +1418,15 @@
 
 void Launcher::RecvMouseWheel(int x, int y, int wheel_delta, unsigned long button_flags, unsigned long key_flags)
 {
+}
+
+const gchar* Launcher::GetName ()
+{
+	return "Launcher";
+}
+
+void Launcher::AddProperties (GVariantBuilder *builder)
+{
 }
 
 void Launcher::EventLogic ()

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2010-11-24 01:04:17 +0000
+++ src/Launcher.h	2010-11-24 17:57:00 +0000
@@ -23,7 +23,8 @@
 #include <sys/time.h>
 
 #include <Nux/View.h>
-#include <Nux/BaseWindow.h>
+#include <Nux/BaseWindow.h>
+#include "Introspectable.h"
 #include "LauncherIcon.h"
 #include "NuxGraphics/IOpenGLAsmShader.h"
 #include "Nux/TimerProc.h"
@@ -31,49 +32,53 @@
 class LauncherModel;
 class QuicklistView;
 
-class Launcher : public nux::View
+class Launcher : public Introspectable, public nux::View
 {
 public:
-  Launcher(nux::BaseWindow *parent, NUX_FILE_LINE_PROTO);
-  ~Launcher();
-
-  virtual long ProcessEvent(nux::IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
-  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-  virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-  virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-  LauncherIcon* GetActiveTooltipIcon() {return m_ActiveTooltipIcon;}
-  LauncherIcon* GetActiveMenuIcon() {return m_ActiveMenuIcon;}
-
-  bool TooltipNotify(LauncherIcon* Icon);
-  bool MenuNotify(LauncherIcon* Icon);
-  
-  void SetIconSize(int tile_size, int icon_size);
-  void NotifyMenuTermination(LauncherIcon* Icon);
-  
-  void SetModel (LauncherModel *model);
-  
-  void SetFloating (bool floating);
-  
-  void SetAutohide (bool autohide, nux::View *show_trigger);
-  bool AutohideEnabled ();
-  
-  virtual void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
-  virtual void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
-  virtual void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-  virtual void RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
-  virtual void RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
-  virtual void RecvMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-  virtual void RecvMouseWheel(int x, int y, int wheel_delta, unsigned long button_flags, unsigned long key_flags);
-
-  
-  //! Called by LauncherIcon to signal that a Quicklist is becoming active.
-  void SetActiveQuicklist (QuicklistView *quicklist);
-  //! Get the active qicklist
-  QuicklistView *GetActiveQuicklist ();
-  //! Called by LauncherIcon to signal that a Quicklist is becoming unactive.
-  void CancelActiveQuicklist (QuicklistView *quicklist);
-  
+    Launcher(nux::BaseWindow *parent, NUX_FILE_LINE_PROTO);
+    ~Launcher();
+
+    virtual long ProcessEvent(nux::IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
+    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+    LauncherIcon* GetActiveTooltipIcon() {return m_ActiveTooltipIcon;}
+    LauncherIcon* GetActiveMenuIcon() {return m_ActiveMenuIcon;}
+
+    bool TooltipNotify(LauncherIcon* Icon);
+    bool MenuNotify(LauncherIcon* Icon);
+    
+    void SetIconSize(int tile_size, int icon_size);
+    void NotifyMenuTermination(LauncherIcon* Icon);
+    
+    void SetModel (LauncherModel *model);
+    
+    void SetFloating (bool floating);
+    
+    void SetAutohide (bool autohide, nux::View *show_trigger);
+    bool AutohideEnabled ();
+    
+    virtual void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
+    virtual void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
+    virtual void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
+    virtual void RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
+    virtual void RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
+    virtual void RecvMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
+    virtual void RecvMouseWheel(int x, int y, int wheel_delta, unsigned long button_flags, unsigned long key_flags);
+
+    //! Called by LauncherIcon to signal that a Quicklist is becoming active.
+    void SetActiveQuicklist (QuicklistView *quicklist);
+    //! Get the active qicklist
+    QuicklistView *GetActiveQuicklist ();
+    //! Called by LauncherIcon to signal that a Quicklist is becoming unactive.
+    void CancelActiveQuicklist (QuicklistView *quicklist);
+
+protected:	
+	// Introspectable methods
+	const gchar* GetName ();
+	void AddProperties (GVariantBuilder *builder);
+
 private:
   typedef enum
   {

=== modified file 'src/PanelView.cpp'
--- src/PanelView.cpp	2010-11-17 11:41:42 +0000
+++ src/PanelView.cpp	2010-11-24 17:57:00 +0000
@@ -63,6 +63,15 @@
 {
   return _home_button;
 }
+
+const gchar* PanelView::GetName ()
+{
+	return "PanelView";
+}
+
+void PanelView::AddProperties (GVariantBuilder *builder)
+{
+}
 
 long
 PanelView::ProcessEvent (nux::IEvent &ievent, long TraverseInfo, long ProcessEventInfo)

=== modified file 'src/PanelView.h'
--- src/PanelView.h	2010-11-11 15:07:58 +0000
+++ src/PanelView.h	2010-11-24 17:57:00 +0000
@@ -25,8 +25,9 @@
 
 #include "PanelHomeButton.h"
 #include "IndicatorObjectFactoryRemote.h"
+#include "Introspectable.h"
 
-class PanelView : public nux::View
+class PanelView : public Introspectable, public nux::View
 {
 public:
   PanelView (NUX_FILE_LINE_PROTO);
@@ -42,7 +43,12 @@
   void OnObjectAdded (IndicatorObjectProxy *proxy);
   void OnMenuPointerMoved (int x, int y);
   
-  PanelHomeButton * HomeButton ();
+  PanelHomeButton * HomeButton ();
+
+protected:
+  // Introspectable methods
+  const gchar* GetName ();
+  void AddProperties (GVariantBuilder *builder);
 
 private:
   void UpdateBackground ();

=== modified file 'src/unity.cpp'
--- src/unity.cpp	2010-11-24 16:35:32 +0000
+++ src/unity.cpp	2010-11-24 17:57:00 +0000
@@ -237,6 +237,17 @@
     return true;
 }
 
+void
+UnityScreen::AddProperties (GVariantBuilder *builder)
+{
+}
+
+const gchar*
+UnityScreen::GetName ()
+{
+	return "Unity";
+}
+
 /* This gets called whenever the window needs to be repainted. WindowPaintAttrib gives you some
  * attributes like brightness/saturation etc to play around with. GLMatrix is the window's
  * transformation matrix. the unsigned int is the mask, have a look at opengl.h on what you can do
@@ -453,7 +464,9 @@
     
     wt->Run (NULL);
     uScreen = this;
-    
+
+	debugger = new IntrospectionDBusInterface (this);
+	
     PluginAdapter::Initialize (screen);
 
     optionSetLauncherAutohideNotify (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
@@ -490,6 +503,7 @@
   
   self->launcherWindow = new nux::BaseWindow(TEXT(""));
   self->launcher = new Launcher(self->launcherWindow);
+  self->AddChild (self->launcher);
 
   nux::HLayout* layout = new nux::HLayout();
 
@@ -512,6 +526,7 @@
 
   /* Setup panel */
   self->panelView = new PanelView ();
+  self->AddChild (self->panelView);
 
   layout = new nux::HLayout();
 

=== modified file 'src/unity.h'
--- src/unity.h	2010-11-24 11:30:46 +0000
+++ src/unity.h	2010-11-24 17:57:00 +0000
@@ -41,10 +41,11 @@
 /* This is the options class header created for us automatically on build with BCOP */
 #include "unityshell_options.h"
 
+#include "Introspectable.h"
 #include "Launcher.h"
 #include "LauncherController.h"
 #include "PanelView.h"
-
+#include "IntrospectionDBusInterface.h"
 #include <Nux/WindowThread.h>
 #include <sigc++/sigc++.h>
 
@@ -53,7 +54,8 @@
  * instance per screen.
  */
 
-class UnityScreen :
+class UnityScreen : 
+	public Introspectable,
     public sigc::trackable,
     /* You should inherit the ScreenInterface class if you want to dynamically hook
      * screen-level core functions. */
@@ -158,6 +160,12 @@
 	initPluginForScreen (CompPlugin *p);
 
 	bool			doShellRepaint;
+
+    protected:
+
+	const gchar* GetName ();
+
+	void AddProperties (GVariantBuilder *builder);
 	
     private:
     
@@ -178,17 +186,18 @@
 
 	static void 
 	initUnity(nux::NThread* thread, void* InitData);
-	
+
 	static gboolean 
 	strutHackTimeout (gpointer data);
 	
-	Launcher               *launcher;
-	LauncherController     *controller;
-	PanelView              *panelView;
-	nux::WindowThread      *wt;
-	nux::BaseWindow        *launcherWindow;
-	nux::BaseWindow        *panelWindow;
-	nux::Geometry           lastTooltipArea;
+	Launcher               			*launcher;
+	LauncherController    	 		*controller;
+	PanelView              			*panelView;
+	nux::WindowThread      			*wt;
+	nux::BaseWindow        			*launcherWindow;
+	nux::BaseWindow        			*panelWindow;
+	nux::Geometry                   lastTooltipArea;
+	IntrospectionDBusInterface 		*debugger;
 };
 
 class UnityWindow :