Merge lp:~3v1n0/unity/ap1.4-introspection-cleanup into lp:unity

[Marco Trevisan (Treviño)]

Introspectable: use IntrospectionData class for collecting data from children

Now each introspectable object is called with an IntrospectionData parameter and calling one of its methods it's the only way to fill introspection data into unity.
As bonus point, remove all the unneeded UnityCore/Variant.cpp inclusions.

Rewrite Introspectable to make it use the new debug::IntrospectionData to gather the introspection bits from unity children.

[Marco Trevisan (Treviño) (3v1n0)]

3158 +enum class ValueType : uint32_t:

TODO: add support to point-3d (lp:~thomir/autopilot/trunk-fix-type-id-docs/+merge/192962)

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Merged with trunk and added missing bits, I think this is now ready for being merged.

review: Abstain

[Brandon Schaefer (brandontschaefer)]

Everything looks good, one thing:

622 + for (auto icon : icons_)

Could you use const& :)

[Marco Trevisan (Treviño) (3v1n0)]

> Everything looks good, one thing:
>
> 622 + for (auto icon : icons_)
>
> Could you use const& :)

It shouldn't really matter, as icons_ is a vector of pointers, so copying a pointer or a reference to it is basically the same.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3553
http://jenkins.qa.ubuntu.com/job/unity-ci/501/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/32
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/32/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/501/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3556
http://jenkins.qa.ubuntu.com/job/unity-ci/509/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/40
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/41/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/509/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3557
http://jenkins.qa.ubuntu.com/job/unity-ci/510/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/41
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/43/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/510/rebuild

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3559
http://jenkins.qa.ubuntu.com/job/unity-ci/511/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/45

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/511/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3559
http://jenkins.qa.ubuntu.com/job/unity-ci/512/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/46

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/512/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'UnityCore/GLibDBusProxy.cpp'
--- UnityCore/GLibDBusProxy.cpp	2013-11-14 03:00:29 +0000
+++ UnityCore/GLibDBusProxy.cpp	2013-11-20 14:19:17 +0000
@@ -281,8 +281,7 @@
     g_variant_get(changed_props, "a{sv}", &iter);
     while (g_variant_iter_loop(iter, "{&sv}", &property_name, &value))
     {
-      LOG_DEBUG(logger) << "Property: '" << property_name << "': "
-                        << glib::String(g_variant_print(value, TRUE));
+      LOG_DEBUG(logger) << "Property: '" << property_name << "': " << value;
 
       auto handler_it = property_handlers_.find(property_name);
 

=== modified file 'UnityCore/GLibDBusServer.cpp'
--- UnityCore/GLibDBusServer.cpp	2013-07-17 18:17:52 +0000
+++ UnityCore/GLibDBusServer.cpp	2013-11-20 14:19:17 +0000
@@ -88,11 +88,9 @@
       {
         ret = self->method_cb_(method_name ? method_name : "", parameters);
 
-        LOG_INFO(logger_o) << "Called method: '" << method_name << " "
-                           << (parameters ? String(g_variant_print(parameters, TRUE)) : "()")
+        LOG_INFO(logger_o) << "Called method: '" << method_name << " " << parameters
                            << "' on object '" << object_path << "' with interface '"
-                           << interface_name << "' , returning: '"
-                           << (ret ? String(g_variant_print(ret, TRUE)) : "()") << "'";
+                           << interface_name << "' , returning: '" << ret << "'";
 
         const GDBusMethodInfo* info = g_dbus_method_invocation_get_method_info(invocation);
 
@@ -115,8 +113,7 @@
       }
       else
       {
-        LOG_WARN(logger_o) << "Called method: '" << method_name << " "
-                           << (parameters ? String(g_variant_print(parameters, TRUE)) : "()")
+        LOG_WARN(logger_o) << "Called method: '" << method_name << " " << parameters
                            << "' on object '" << object_path << "' with interface '"
                            << interface_name << "', but no methods handler is set";
 
@@ -136,8 +133,7 @@
         value = self->property_get_cb_(property_name ? property_name : "");
 
       LOG_INFO(logger_o) << "Getting property '" << property_name << "' on '"
-                         << interface_name << "' , returning: '"
-                         << (value ? String(g_variant_print(value, TRUE)) : "()") << "'";
+                         << interface_name << "' , returning: '" << value << "'";
 
       return value;
     };
@@ -167,8 +163,7 @@
       if (ret)
       {
         LOG_INFO(logger_o) << "Setting property '" << property_name << "' on '"
-                           << interface_name << "' , to value: '"
-                           << (value ? String(g_variant_print(value, TRUE)) : "<null>") << "'";
+                           << interface_name << "' , to value: '" << value << "'";
 
         if (old_value && !g_variant_equal(old_value, value))
           self->EmitPropertyChanged(property_name ? property_name : "");
@@ -177,9 +172,7 @@
       {
         LOG_WARN(logger_o) << "It was impossible to set the property '"
                            << property_name << "' on '" << interface_name
-                           << "' , to value: '"
-                           << (value ? String(g_variant_print(value, TRUE)) : "()")
-                           << "'";
+                           << "' , to value: '" << value << "'";
       }
 
       return ret;

=== modified file 'UnityCore/Variant.cpp'
--- UnityCore/Variant.cpp	2013-09-19 13:23:11 +0000
+++ UnityCore/Variant.cpp	2013-11-20 14:19:17 +0000
@@ -20,6 +20,7 @@
 
 #include "Variant.h"
 #include <NuxCore/Logger.h>
+#include "GLibWrapper.h"
 
 namespace unity
 {
@@ -85,6 +86,16 @@
   : Variant(g_variant_new_uint64(value))
 {}
 
+#if __WORDSIZE != 64
+Variant::Variant(long value)
+  : Variant(static_cast<int64_t>(value))
+{}
+
+Variant::Variant(unsigned long value)
+  : Variant(static_cast<uint64_t>(value))
+{}
+#endif
+
 Variant::Variant(bool value)
   : Variant(g_variant_new_boolean(value))
 {}
@@ -320,6 +331,10 @@
 Variant& Variant::operator=(uint32_t value) { return operator=(Variant(value)); }
 Variant& Variant::operator=(int64_t value) { return operator=(Variant(value)); }
 Variant& Variant::operator=(uint64_t value) { return operator=(Variant(value)); }
+#if __WORDSIZE != 64
+Variant& Variant::operator=(long value) { return operator=(Variant(value)); }
+Variant& Variant::operator=(unsigned long value) { return operator=(Variant(value)); }
+#endif
 Variant& Variant::operator=(bool value) { return operator=(Variant(value)); }
 Variant& Variant::operator=(double value) { return operator=(Variant(value)); }
 Variant& Variant::operator=(float value) { return operator=(Variant(value)); }
@@ -367,136 +382,20 @@
   gpointer key, value;
   g_hash_table_iter_init(&hints_iter, hashtable);
   while (g_hash_table_iter_next(&hints_iter, &key, &value))
-  {
-    std::string hint_key(static_cast<gchar*>(key));
-    glib::Variant hint_value(static_cast<GVariant*>(value));
+    hints.insert({static_cast<gchar*>(key), static_cast<GVariant*>(value)});
 
-    hints.insert({hint_key, hint_value});
-  }
   return hints;
 }
 
+std::ostream& operator<<(std::ostream &os, GVariant* v)
+{
+  return os << (v ? String(g_variant_print(v, TRUE)) : "()");
+}
+
+std::ostream& operator<<(std::ostream &os, Variant const& v)
+{
+  return os << static_cast<GVariant*>(v);
+}
+
 } // namespace glib
-
-namespace variant
-{
-using namespace glib;
-
-BuilderWrapper::BuilderWrapper(GVariantBuilder* builder)
-  : builder_(builder)
-{}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, ValueType type, std::vector<Variant> const& values)
-{
-  GVariantBuilder array;
-  g_variant_builder_init(&array, G_VARIANT_TYPE("av"));
-  g_variant_builder_add(&array, "v", g_variant_new_uint32(static_cast<uint32_t>(type)));
-
-  for (auto const& value : values)
-    g_variant_builder_add(&array, "v", static_cast<GVariant*>(value));
-
-  g_variant_builder_add(builder_, "{sv}", name.c_str(), g_variant_builder_end(&array));
-
-  return *this;
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, bool value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, char const* value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, std::string const& value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, int16_t value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, int32_t value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, int64_t value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, uint16_t value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, uint32_t value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, uint64_t value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, float value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, double value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, GVariant* value)
-{
-  return add(name, ValueType::SIMPLE, {Variant(value)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, glib::Variant const& value)
-{
-  return add(name, ValueType::SIMPLE, {value});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, nux::Rect const& r)
-{
-  return add(name, ValueType::RECTANGLE, {Variant(r.x), Variant(r.y), Variant(r.width), Variant(r.height)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, nux::Point const& p)
-{
-  return add(name, ValueType::POINT, {Variant(p.x), Variant(p.y)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, nux::Size const& s)
-{
-  return add(name, ValueType::SIZE, {Variant(s.width), Variant(s.height)});
-}
-
-BuilderWrapper& BuilderWrapper::add(std::string const& name, nux::Color const& c)
-{
-  int32_t r = c.red * 255.0f, g = c.green * 255.0f, b = c.blue * 255.0f, a = c.alpha * 255.0f;
-  return add(name, ValueType::COLOR, {Variant(r), Variant(g), Variant(b), Variant(a)});
-}
-
-BuilderWrapper& BuilderWrapper::add(nux::Rect const& value)
-{
-  add("globalRect", value);
-  // Legacy support
-  add("x", value.x);
-  add("y", value.y);
-  add("width", value.width);
-  add("height", value.height);
-  return *this;
-}
-
-
-}
-}
+} // namespace unity

=== modified file 'UnityCore/Variant.h'
--- UnityCore/Variant.h	2013-09-19 13:06:58 +0000
+++ UnityCore/Variant.h	2013-11-20 14:19:17 +0000
@@ -26,9 +26,6 @@
 #include <vector>
 #include <map>
 
-#include <NuxCore/Rect.h>
-#include <NuxCore/Color.h>
-
 namespace unity
 {
 namespace glib
@@ -59,6 +56,10 @@
   explicit Variant(uint32_t);
   explicit Variant(int64_t);
   explicit Variant(uint64_t);
+#if __WORDSIZE != 64
+  explicit Variant(long);
+  explicit Variant(unsigned long);
+#endif
   explicit Variant(bool);
   explicit Variant(double);
   explicit Variant(float);
@@ -81,6 +82,20 @@
 
   bool ASVToHints(HintsMap& hints) const;
 
+  template <typename T>
+  static inline Variant FromVector(std::vector<T> const& values)
+  {
+    if (values.empty())
+      return g_variant_new_array(G_VARIANT_TYPE_VARIANT, nullptr, 0);
+
+    GVariantBuilder builder;
+    g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+    for (auto const& value : values)
+      g_variant_builder_add_value(&builder, Variant(value));
+
+    return g_variant_builder_end(&builder);
+  }
+
   void swap(Variant&);
   Variant& operator=(GVariant*);
   Variant& operator=(Variant);
@@ -95,6 +110,10 @@
   Variant& operator=(uint32_t);
   Variant& operator=(int64_t);
   Variant& operator=(uint64_t);
+#if __WORDSIZE != 64
+  Variant& operator=(long);
+  Variant& operator=(unsigned long);
+#endif
   Variant& operator=(bool);
   Variant& operator=(double);
   Variant& operator=(float);
@@ -105,55 +124,10 @@
   GVariant* variant_;
 };
 
-}
-
-namespace variant
-{
-
-class BuilderWrapper
-{
-// XXX: Move this to Introspectable
-public:
-  enum class ValueType : uint32_t
-  {
-    // This should match the Autopilot Type IDs
-    SIMPLE = 0,
-    RECTANGLE = 1,
-    POINT = 2,
-    SIZE = 3,
-    COLOR = 4,
-    DATE = 5,
-    TIME = 6,
-  };
-
-  BuilderWrapper(GVariantBuilder* builder);
-
-  BuilderWrapper& add(std::string const& name, bool);
-  BuilderWrapper& add(std::string const& name, const char*);
-  BuilderWrapper& add(std::string const& name, std::string const&);
-  BuilderWrapper& add(std::string const& name, int16_t);
-  BuilderWrapper& add(std::string const& name, int32_t);
-  BuilderWrapper& add(std::string const& name, int64_t);
-  BuilderWrapper& add(std::string const& name, uint16_t);
-  BuilderWrapper& add(std::string const& name, uint32_t);
-  BuilderWrapper& add(std::string const& name, uint64_t);
-  BuilderWrapper& add(std::string const& name, float);
-  BuilderWrapper& add(std::string const& name, double);
-  BuilderWrapper& add(std::string const& name, glib::Variant const&);
-  BuilderWrapper& add(std::string const& name, GVariant*);
-
-  BuilderWrapper& add(std::string const& name, nux::Rect const&);
-  BuilderWrapper& add(std::string const& name, nux::Point const&);
-  BuilderWrapper& add(std::string const& name, nux::Size const&);
-  BuilderWrapper& add(std::string const& name, nux::Color const&);
-  BuilderWrapper& add(nux::Rect const&);
-
-private:
-  BuilderWrapper& add(std::string const& name, ValueType, std::vector<glib::Variant> const&);
-  GVariantBuilder* builder_;
-};
-
-}
-}
+std::ostream& operator<<(std::ostream &os, GVariant* v);
+std::ostream& operator<<(std::ostream &os, Variant const&);
+
+} // glib namespace
+} // unity namespace
 
 #endif

=== modified file 'dash/CoverflowResultView.cpp'
--- dash/CoverflowResultView.cpp	2013-11-18 18:13:59 +0000
+++ dash/CoverflowResultView.cpp	2013-11-20 14:19:17 +0000
@@ -18,7 +18,6 @@
  */
 
 #include "CoverflowResultView.h"
-#include <UnityCore/Variant.h>
 #include "unity-shared/IconLoader.h"
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/DashStyle.h"

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2013-11-14 03:00:29 +0000
+++ dash/DashController.cpp	2013-11-20 14:19:17 +0000
@@ -418,11 +418,11 @@
   return "DashController";
 }
 
-void Controller::AddProperties(GVariantBuilder* builder)
+void Controller::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder).add("visible", visible_)
-                                  .add("ideal_monitor", GetIdealMonitor())
-                                  .add("monitor", monitor_);
+  introspection.add("visible", visible_)
+               .add("ideal_monitor", GetIdealMonitor())
+               .add("monitor", monitor_);
 }
 
 void Controller::ReFocusKeyInput()

=== modified file 'dash/DashController.h'
--- dash/DashController.h	2013-10-14 16:42:26 +0000
+++ dash/DashController.h	2013-11-20 14:19:17 +0000
@@ -72,7 +72,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   void EnsureDash();

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-11-14 03:00:29 +0000
+++ dash/DashView.cpp	2013-11-20 14:19:17 +0000
@@ -1422,7 +1422,7 @@
   return "DashView";
 }
 
-void DashView::AddProperties(GVariantBuilder* builder)
+void DashView::AddProperties(debug::IntrospectionData& introspection)
 {
   dash::Style& style = dash::Style::Instance();
   int num_rows = 1; // The search bar
@@ -1439,16 +1439,15 @@
   else if (Settings::Instance().form_factor() == FormFactor::TV)
     form_factor = "tv";
 
-  unity::variant::BuilderWrapper wrapper(builder);
-  wrapper.add(nux::Geometry(GetAbsoluteX(), GetAbsoluteY(), content_geo_.width, content_geo_.height));
-  wrapper.add("num_rows", num_rows);
-  wrapper.add("form_factor", form_factor);
-  wrapper.add("right-border-width", style.GetDashRightTileWidth());
-  wrapper.add("bottom-border-height", style.GetDashBottomTileHeight());
-  wrapper.add("preview_displaying", preview_displaying_);
-  wrapper.add("preview_animation", animate_split_value_ * animate_preview_container_value_ * animate_preview_value_);
-  wrapper.add("dash_maximized", style.always_maximised());
-  wrapper.add("overlay_window_buttons_shown", overlay_window_buttons_->IsVisible());
+  introspection.add(nux::Geometry(GetAbsoluteX(), GetAbsoluteY(), content_geo_.width, content_geo_.height))
+               .add("num_rows", num_rows)
+               .add("form_factor", form_factor)
+               .add("right-border-width", style.GetDashRightTileWidth())
+               .add("bottom-border-height", style.GetDashBottomTileHeight())
+               .add("preview_displaying", preview_displaying_)
+               .add("preview_animation", animate_split_value_ * animate_preview_container_value_ * animate_preview_value_)
+               .add("dash_maximized", style.always_maximised())
+               .add("overlay_window_buttons_shown", overlay_window_buttons_->IsVisible());
 }
 
 nux::Area* DashView::KeyNavIteration(nux::KeyNavDirection direction)

=== modified file 'dash/DashView.h'
--- dash/DashView.h	2013-10-29 22:33:02 +0000
+++ dash/DashView.h	2013-11-20 14:19:17 +0000
@@ -27,13 +27,13 @@
 #include <UnityCore/ConnectionManager.h>
 #include <UnityCore/Scopes.h>
 #include <UnityCore/GLibSource.h>
+#include <UnityCore/Preview.h>
 
 #include "ScopeBar.h"
 #include "ScopeView.h"
 #include "ApplicationStarter.h"
 #include "previews/PreviewContainer.h"
 #include "PreviewStateMachine.h"
-#include "UnityCore/Preview.h"
 
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/BGHash.h"
@@ -125,7 +125,7 @@
   bool AcceptKeyNavFocus();
   bool InspectKeyEvent(unsigned int eventType, unsigned int key_sym, const char* character);
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 

=== modified file 'dash/FilterBar.cpp'
--- dash/FilterBar.cpp	2013-09-18 14:41:08 +0000
+++ dash/FilterBar.cpp	2013-11-20 14:19:17 +0000
@@ -142,9 +142,9 @@
   return "FilterBar";
 }
 
-void FilterBar::AddProperties(GVariantBuilder* builder)
+void FilterBar::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder).add(GetAbsoluteGeometry());
+  introspection.add(GetAbsoluteGeometry());
 }
 
 } // namespace dash

=== modified file 'dash/FilterBar.h'
--- dash/FilterBar.h	2013-01-21 18:05:47 +0000
+++ dash/FilterBar.h	2013-11-20 14:19:17 +0000
@@ -57,7 +57,7 @@
 
   // Introspection
   virtual std::string GetName() const;
-  virtual void AddProperties(GVariantBuilder* builder);
+  virtual void AddProperties(debug::IntrospectionData&);
 
 private:
   void Init();

=== modified file 'dash/FilterExpanderLabel.cpp'
--- dash/FilterExpanderLabel.cpp	2013-11-14 03:00:29 +0000
+++ dash/FilterExpanderLabel.cpp	2013-11-20 14:19:17 +0000
@@ -309,7 +309,7 @@
   return "FilterExpanderLabel";
 }
 
-void FilterExpanderLabel::AddProperties(GVariantBuilder* builder)
+void FilterExpanderLabel::AddProperties(debug::IntrospectionData& introspection)
 {
   bool content_has_focus = false;
   auto focus_area = nux::GetWindowCompositor().GetKeyFocusArea();
@@ -317,12 +317,10 @@
   if (focus_area && contents_)
     content_has_focus = focus_area->IsChildOf(contents_.GetPointer());
 
-  unity::variant::BuilderWrapper wrapper(builder);
-
-  wrapper.add("expander-has-focus", (expander_view_ && expander_view_->HasKeyFocus()))
-         .add("expanded", expanded())
-         .add(GetAbsoluteGeometry())
-         .add("content-has-focus", content_has_focus);
+  introspection.add("expander-has-focus", (expander_view_ && expander_view_->HasKeyFocus()))
+               .add("expanded", expanded())
+               .add(GetAbsoluteGeometry())
+               .add("content-has-focus", content_has_focus);
 }
 
 } // namespace dash

=== modified file 'dash/FilterExpanderLabel.h'
--- dash/FilterExpanderLabel.h	2012-12-17 18:00:40 +0000
+++ dash/FilterExpanderLabel.h	2013-11-20 14:19:17 +0000
@@ -75,7 +75,7 @@
 
   // Introspection
   virtual std::string GetName() const;
-  virtual void AddProperties(GVariantBuilder* builder);
+  virtual void AddProperties(debug::IntrospectionData&);
 
 private:
   void BuildLayout();

=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2013-11-14 03:00:29 +0000
+++ dash/PlacesGroup.cpp	2013-11-20 14:19:17 +0000
@@ -27,8 +27,6 @@
 #include <glib.h>
 #include "config.h"
 #include <glib/gi18n-lib.h>
-
-#include <UnityCore/Variant.h>
 #include <UnityCore/GLibWrapper.h>
 
 #include "unity-shared/StaticCairoText.h"
@@ -641,10 +639,8 @@
   return "PlacesGroup";
 }
 
-void PlacesGroup::AddProperties(GVariantBuilder* builder)
+void PlacesGroup::AddProperties(debug::IntrospectionData& wrapper)
 {
-  unity::variant::BuilderWrapper wrapper(builder);
-
   wrapper.add("header-x", _header_view->GetAbsoluteX());
   wrapper.add("header-y", _header_view->GetAbsoluteY());
   wrapper.add("header-width", _header_view->GetAbsoluteWidth());

=== modified file 'dash/PlacesGroup.h'
--- dash/PlacesGroup.h	2013-05-01 22:03:12 +0000
+++ dash/PlacesGroup.h	2013-11-20 14:19:17 +0000
@@ -106,7 +106,7 @@
 
   // Introspection
   virtual std::string GetName() const;
-  virtual void AddProperties(GVariantBuilder* builder);
+  virtual void AddProperties(debug::IntrospectionData&);
 
 private:
   void Refresh();

=== modified file 'dash/ResultView.cpp'
--- dash/ResultView.cpp	2013-11-14 03:00:29 +0000
+++ dash/ResultView.cpp	2013-11-20 14:19:17 +0000
@@ -24,7 +24,6 @@
 #include "ResultView.h"
 
 #include <Nux/Layout.h>
-#include <UnityCore/Variant.h>
 
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/GraphicsUtils.h"
@@ -271,13 +270,13 @@
 
 void ResultView::GetResultDimensions(int& rows, int& columns)
 {
-  columns = results_per_row;  
+  columns = results_per_row;
   rows = result_model_ ? ceil(static_cast<double>(result_model_->count()) / static_cast<double>(std::max(1, columns))) : 0.0;
 }
 
-void ResultView::AddProperties(GVariantBuilder* builder)
+void ResultView::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
     .add("expanded", expanded);
 }
 

=== modified file 'dash/ResultView.h'
--- dash/ResultView.h	2013-07-08 20:11:44 +0000
+++ dash/ResultView.h	2013-11-20 14:19:17 +0000
@@ -85,7 +85,7 @@
 
   std::string GetName() const;
   ResultIterator GetIteratorAtRow(unsigned row);
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   IntrospectableList GetIntrospectableChildren();
 
   virtual int GetSelectedIndex() const;

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2013-11-14 03:00:29 +0000
+++ dash/ResultViewGrid.cpp	2013-11-20 14:19:17 +0000
@@ -28,7 +28,6 @@
 #include <gdk/gdk.h>
 #include <unity-protocol.h>
 
-#include <UnityCore/Variant.h>
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/Timer.h"
 #include "unity-shared/UBusWrapper.h"

=== modified file 'dash/ScopeBar.cpp'
--- dash/ScopeBar.cpp	2013-11-14 03:00:29 +0000
+++ dash/ScopeBar.cpp	2013-11-20 14:19:17 +0000
@@ -268,25 +268,21 @@
   return "ScopeBar";
 }
 
-void ScopeBar::AddProperties(GVariantBuilder* builder)
+void ScopeBar::AddProperties(debug::IntrospectionData& wrapper)
 {
-  unity::variant::BuilderWrapper wrapper(builder);
-
-  wrapper.add("focused-scope-icon", "");
-
-  for( auto icon : icons_)
+  for (auto icon : icons_)
   {
     if (icon->active)
-      wrapper.add("active-scope", icon->id.Get());
+      wrapper.add("active-scope", icon->id());
 
     if (icon->HasKeyFocus())
-      wrapper.add("focused-scope-icon", icon->id.Get());
+      wrapper.add("focused-scope-icon", icon->id());
   }
 }
 
 std::string ScopeBar::GetActiveScopeId() const
 {
-  for (auto icon : icons_)
+  for (auto* icon : icons_)
   {
     if (icon->active)
       return icon->id;

=== modified file 'dash/ScopeBar.h'
--- dash/ScopeBar.h	2013-07-12 10:26:02 +0000
+++ dash/ScopeBar.h	2013-11-20 14:19:17 +0000
@@ -77,7 +77,7 @@
 
   bool AcceptKeyNavFocus();
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;
 

=== modified file 'dash/ScopeBarIcon.cpp'
--- dash/ScopeBarIcon.cpp	2013-11-14 03:00:29 +0000
+++ dash/ScopeBarIcon.cpp	2013-11-20 14:19:17 +0000
@@ -16,8 +16,6 @@
  * Authored by: Neil Jagdish Patel <[e-mail]>
  */
 
-#include <UnityCore/Variant.h>
-
 #include "unity-shared/DashStyle.h"
 #include "ScopeBarIcon.h"
 
@@ -120,10 +118,8 @@
   return "ScopeBarIcon";
 }
 
-void ScopeBarIcon::AddProperties(GVariantBuilder* builder)
+void ScopeBarIcon::AddProperties(debug::IntrospectionData& wrapper)
 {
-  unity::variant::BuilderWrapper wrapper(builder);
-
   wrapper.add(GetAbsoluteGeometry());
   wrapper.add("name", id);
 }

=== modified file 'dash/ScopeBarIcon.h'
--- dash/ScopeBarIcon.h	2013-02-12 11:45:57 +0000
+++ dash/ScopeBarIcon.h	2013-11-20 14:19:17 +0000
@@ -49,7 +49,7 @@
 
   // Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2013-11-14 03:00:29 +0000
+++ dash/ScopeView.cpp	2013-11-20 14:19:17 +0000
@@ -1142,9 +1142,9 @@
   return "ScopeView";
 }
 
-void ScopeView::AddProperties(GVariantBuilder* builder)
+void ScopeView::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
     .add("name", scope_->id)
     .add("scope-name", scope_->name)
     .add("visible", IsVisible())

=== modified file 'dash/ScopeView.h'
--- dash/ScopeView.h	2013-07-01 23:32:57 +0000
+++ dash/ScopeView.h	2013-11-20 14:19:17 +0000
@@ -133,7 +133,7 @@
   
   virtual bool AcceptKeyNavFocus();
   virtual std::string GetName() const;
-  virtual void AddProperties(GVariantBuilder* builder);
+  virtual void AddProperties(debug::IntrospectionData&);
 
   void OnCompositorKeyNavFocusChanged(nux::Area*, bool, nux::KeyNavDirection);
 

=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/ActionButton.cpp	2013-11-20 14:19:17 +0000
@@ -25,7 +25,6 @@
 #include <Nux/HLayout.h>
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/StaticCairoText.h"
-#include <UnityCore/Variant.h>
 
 namespace
 {
@@ -61,9 +60,9 @@
   return "ActionButton";
 }
 
-void ActionButton::AddProperties(GVariantBuilder* builder)
+void ActionButton::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(GetAbsoluteGeometry())
     .add("action", action_hint_)
     .add("label", label_)

=== modified file 'dash/previews/ActionButton.h'
--- dash/previews/ActionButton.h	2012-12-14 12:14:34 +0000
+++ dash/previews/ActionButton.h	2013-11-20 14:19:17 +0000
@@ -74,7 +74,7 @@
  
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;

=== modified file 'dash/previews/ActionLink.cpp'
--- dash/previews/ActionLink.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/ActionLink.cpp	2013-11-20 14:19:17 +0000
@@ -22,7 +22,6 @@
 #include "ActionLink.h"
 #include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
-#include <UnityCore/Variant.h>
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/StaticCairoText.h"
@@ -54,9 +53,9 @@
   return "ActionLink";
 }
 
-void ActionLink::AddProperties(GVariantBuilder* builder)
+void ActionLink::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(GetAbsoluteGeometry())
     .add("action", action_hint_)
     .add("label", label_)

=== modified file 'dash/previews/ActionLink.h'
--- dash/previews/ActionLink.h	2013-01-22 16:10:15 +0000
+++ dash/previews/ActionLink.h	2013-11-20 14:19:17 +0000
@@ -71,7 +71,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   // this methods/vars could be private but are protected to make testing
   //  easier

=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/ApplicationPreview.cpp	2013-11-20 14:19:17 +0000
@@ -34,7 +34,7 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
- 
+
 #include "ApplicationPreview.h"
 #include "ActionButton.h"
 #include "PreviewInfoHintWidget.h"
@@ -103,9 +103,9 @@
   return "ApplicationPreview";
 }
 
-void ApplicationPreview::AddProperties(GVariantBuilder* builder)
+void ApplicationPreview::AddProperties(debug::IntrospectionData& introspection)
 {
-  Preview::AddProperties(builder);
+  Preview::AddProperties(introspection);
 }
 
 void ApplicationPreview::SetupViews()

=== modified file 'dash/previews/ApplicationPreview.h'
--- dash/previews/ApplicationPreview.h	2012-12-20 18:51:09 +0000
+++ dash/previews/ApplicationPreview.h	2013-11-20 14:19:17 +0000
@@ -46,7 +46,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'dash/previews/ErrorPreview.cpp'
--- dash/previews/ErrorPreview.cpp	2013-07-10 15:14:02 +0000
+++ dash/previews/ErrorPreview.cpp	2013-11-20 14:19:17 +0000
@@ -91,9 +91,9 @@
   return "ErrorPreview";
 }
 
-void ErrorPreview::AddProperties(GVariantBuilder* builder)
+void ErrorPreview::AddProperties(debug::IntrospectionData& introspection)
 {
-  PaymentPreview::AddProperties(builder);
+  PaymentPreview::AddProperties(introspection);
 }
 
 void ErrorPreview::OnActionActivated(ActionButton* button, std::string const& id)

=== modified file 'dash/previews/ErrorPreview.h'
--- dash/previews/ErrorPreview.h	2013-07-10 15:14:02 +0000
+++ dash/previews/ErrorPreview.h	2013-11-20 14:19:17 +0000
@@ -72,7 +72,7 @@
                               unsigned long special_keys_state);
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   nux::Layout* GetTitle();
   nux::Layout* GetPrice();

=== modified file 'dash/previews/GenericPreview.cpp'
--- dash/previews/GenericPreview.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/GenericPreview.cpp	2013-11-20 14:19:17 +0000
@@ -97,9 +97,9 @@
   return "GenericPreview";
 }
 
-void GenericPreview::AddProperties(GVariantBuilder* builder)
+void GenericPreview::AddProperties(debug::IntrospectionData& introspection)
 {
-  Preview::AddProperties(builder);
+  Preview::AddProperties(introspection);
 }
 
 void GenericPreview::SetupViews()

=== modified file 'dash/previews/GenericPreview.h'
--- dash/previews/GenericPreview.h	2012-12-20 18:51:09 +0000
+++ dash/previews/GenericPreview.h	2013-11-20 14:19:17 +0000
@@ -44,7 +44,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'dash/previews/MoviePreview.cpp'
--- dash/previews/MoviePreview.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/MoviePreview.cpp	2013-11-20 14:19:17 +0000
@@ -71,9 +71,9 @@
   return "MoviePreview";
 }
 
-void MoviePreview::AddProperties(GVariantBuilder* builder)
+void MoviePreview::AddProperties(debug::IntrospectionData& introspection)
 {
-  Preview::AddProperties(builder);
+  Preview::AddProperties(introspection);
 }
 
 void MoviePreview::Draw(nux::GraphicsEngine& gfx_engine, bool force_draw)

=== modified file 'dash/previews/MoviePreview.h'
--- dash/previews/MoviePreview.h	2012-12-21 19:22:51 +0000
+++ dash/previews/MoviePreview.h	2013-11-20 14:19:17 +0000
@@ -44,7 +44,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'dash/previews/MusicPaymentPreview.cpp'
--- dash/previews/MusicPaymentPreview.cpp	2013-09-19 00:25:44 +0000
+++ dash/previews/MusicPaymentPreview.cpp	2013-11-20 14:19:17 +0000
@@ -84,9 +84,9 @@
   return "MusicPaymentPreview";
 }
 
-void MusicPaymentPreview::AddProperties(GVariantBuilder* builder)
+void MusicPaymentPreview::AddProperties(debug::IntrospectionData& introspection)
 {
-  PaymentPreview::AddProperties(builder);
+  PaymentPreview::AddProperties(introspection);
 }
 
 void MusicPaymentPreview::OnActionActivated(ActionButton* button, std::string const& id)

=== modified file 'dash/previews/MusicPaymentPreview.h'
--- dash/previews/MusicPaymentPreview.h	2013-07-10 15:14:02 +0000
+++ dash/previews/MusicPaymentPreview.h	2013-11-20 14:19:17 +0000
@@ -74,7 +74,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   nux::Layout* GetTitle();
   nux::Layout* GetPrice();

=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/MusicPreview.cpp	2013-11-20 14:19:17 +0000
@@ -88,9 +88,9 @@
   return "MusicPreview";
 }
 
-void MusicPreview::AddProperties(GVariantBuilder* builder)
+void MusicPreview::AddProperties(debug::IntrospectionData& introspection)
 {
-  Preview::AddProperties(builder);
+  Preview::AddProperties(introspection);
 }
 
 bool MusicPreview::HasUbuntuOneCredentials()

=== modified file 'dash/previews/MusicPreview.h'
--- dash/previews/MusicPreview.h	2013-05-10 10:07:04 +0000
+++ dash/previews/MusicPreview.h	2013-11-20 14:19:17 +0000
@@ -45,7 +45,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'dash/previews/PaymentPreview.cpp'
--- dash/previews/PaymentPreview.cpp	2013-09-18 14:41:08 +0000
+++ dash/previews/PaymentPreview.cpp	2013-11-20 14:19:17 +0000
@@ -53,7 +53,7 @@
 protected:
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   // Key navigation
   virtual bool AcceptKeyNavFocus();
@@ -168,9 +168,9 @@
   return "OverlaySpinner";
 }
 
-void OverlaySpinner::AddProperties(GVariantBuilder* builder)
+void OverlaySpinner::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder).add(GetAbsoluteGeometry());
+  introspection.add(GetAbsoluteGeometry());
 }
 
 
@@ -191,9 +191,9 @@
   return "PaymentPreview";
 }
 
-void PaymentPreview::AddProperties(GVariantBuilder* builder)
+void PaymentPreview::AddProperties(debug::IntrospectionData& introspection)
 {
-  Preview::AddProperties(builder);
+  Preview::AddProperties(introspection);
 }
 
 nux::Layout* PaymentPreview::GetHeader()

=== modified file 'dash/previews/PaymentPreview.h'
--- dash/previews/PaymentPreview.h	2013-07-10 15:14:02 +0000
+++ dash/previews/PaymentPreview.h	2013-11-20 14:19:17 +0000
@@ -60,7 +60,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   // Create and connect an action link to OnActionLinkActivated
   nux::ObjectPtr<ActionLink> CreateLink(dash::Preview::ActionPtr action);

=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/Preview.cpp	2013-11-20 14:19:17 +0000
@@ -120,9 +120,9 @@
   return "Preview";
 }
 
-void Preview::AddProperties(GVariantBuilder* builder)
+void Preview::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(GetAbsoluteGeometry())
     .add("uri", preview_model_->preview_result.uri);
 }

=== modified file 'dash/previews/Preview.h'
--- dash/previews/Preview.h	2013-01-22 15:51:00 +0000
+++ dash/previews/Preview.h	2013-11-20 14:19:17 +0000
@@ -63,7 +63,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   static previews::Preview::Ptr PreviewForModel(dash::Preview::Ptr model);
 

=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/PreviewContainer.cpp	2013-11-20 14:19:17 +0000
@@ -84,9 +84,9 @@
     return "PreviewContent";
   }
 
-  void AddProperties(GVariantBuilder* builder)
+  void AddProperties(debug::IntrospectionData& introspection)
   {
-    variant::BuilderWrapper(builder)
+    introspection
       .add("animating", animating_)
       .add("animation_progress", progress_)
       .add("waiting_preview", waiting_preview_)
@@ -444,9 +444,9 @@
   return "PreviewContainer";
 }
 
-void PreviewContainer::AddProperties(GVariantBuilder* builder)
+void PreviewContainer::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(GetAbsoluteGeometry())
     .add("navigate-left-enabled", !IsNavigationDisabled(Navigation::LEFT))
     .add("navigate-right-enabled", !IsNavigationDisabled(Navigation::RIGHT));

=== modified file 'dash/previews/PreviewContainer.h'
--- dash/previews/PreviewContainer.h	2013-01-04 16:40:51 +0000
+++ dash/previews/PreviewContainer.h	2013-11-20 14:19:17 +0000
@@ -66,7 +66,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 
   // For the nav buttons to the left/right of the previews, call when they are activated

=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
--- dash/previews/PreviewInfoHintWidget.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/PreviewInfoHintWidget.cpp	2013-11-20 14:19:17 +0000
@@ -86,9 +86,9 @@
   return "PreviewInfoHintWidget";
 }
 
-void PreviewInfoHintWidget::AddProperties(GVariantBuilder* builder)
+void PreviewInfoHintWidget::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(GetAbsoluteGeometry());
 }
 

=== modified file 'dash/previews/PreviewInfoHintWidget.h'
--- dash/previews/PreviewInfoHintWidget.h	2013-01-16 15:43:38 +0000
+++ dash/previews/PreviewInfoHintWidget.h	2013-11-20 14:19:17 +0000
@@ -52,7 +52,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   
   void PreLayoutManagement();
 

=== modified file 'dash/previews/PreviewNavigator.cpp'
--- dash/previews/PreviewNavigator.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/PreviewNavigator.cpp	2013-11-20 14:19:17 +0000
@@ -27,7 +27,6 @@
 #include <Nux/VLayout.h>
 #include <unity-shared/IconTexture.h>
 #include <unity-shared/PreviewStyle.h>
-#include <UnityCore/Variant.h>
 
 namespace unity
 {
@@ -63,9 +62,9 @@
   return "PreviewNavigator";
 }
 
-void PreviewNavigator::AddProperties(GVariantBuilder* builder)
+void PreviewNavigator::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add("button-x", texture_->GetAbsoluteX())
     .add("button-y", texture_->GetAbsoluteY())
     .add("button-width", texture_->GetGeometry().width)

=== modified file 'dash/previews/PreviewNavigator.h'
--- dash/previews/PreviewNavigator.h	2012-09-18 09:05:50 +0000
+++ dash/previews/PreviewNavigator.h	2013-11-20 14:19:17 +0000
@@ -50,7 +50,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder*);
+  void AddProperties(debug::IntrospectionData&);
 
   sigc::signal<void> activated;
   

=== modified file 'dash/previews/PreviewRatingsWidget.cpp'
--- dash/previews/PreviewRatingsWidget.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/PreviewRatingsWidget.cpp	2013-11-20 14:19:17 +0000
@@ -29,7 +29,6 @@
 #include "unity-shared/RatingsButton.h"
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/PreviewStyle.h"
-#include <UnityCore/Variant.h>
 #include "PreviewRatingsWidget.h"
 
 namespace unity
@@ -109,9 +108,9 @@
   return "PreviewRatingsWidget";
 }
 
-void PreviewRatingsWidget::AddProperties(GVariantBuilder* builder)
+void PreviewRatingsWidget::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(GetAbsoluteGeometry());
 }
 

=== modified file 'dash/previews/PreviewRatingsWidget.h'
--- dash/previews/PreviewRatingsWidget.h	2013-01-16 15:43:38 +0000
+++ dash/previews/PreviewRatingsWidget.h	2013-11-20 14:19:17 +0000
@@ -62,7 +62,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder*);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   RatingsButton* ratings_;

=== modified file 'dash/previews/SocialPreview.cpp'
--- dash/previews/SocialPreview.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/SocialPreview.cpp	2013-11-20 14:19:17 +0000
@@ -34,7 +34,7 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
- 
+
 #include "SocialPreview.h"
 #include "SocialPreviewContent.h"
 #include "SocialPreviewComments.h"
@@ -104,9 +104,9 @@
   return "SocialPreview";
 }
 
-void SocialPreview::AddProperties(GVariantBuilder* builder)
+void SocialPreview::AddProperties(debug::IntrospectionData& introspection)
 {
-  Preview::AddProperties(builder);
+  Preview::AddProperties(introspection);
 }
 
 void SocialPreview::SetupViews()

=== modified file 'dash/previews/SocialPreview.h'
--- dash/previews/SocialPreview.h	2012-12-20 18:51:09 +0000
+++ dash/previews/SocialPreview.h	2013-11-20 14:19:17 +0000
@@ -48,7 +48,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'dash/previews/SocialPreviewComments.cpp'
--- dash/previews/SocialPreviewComments.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/SocialPreviewComments.cpp	2013-11-20 14:19:17 +0000
@@ -190,8 +190,9 @@
   return "SocialPreviewComments";
 }
 
-void SocialPreviewComments::AddProperties(GVariantBuilder* builder)
+void SocialPreviewComments::AddProperties(debug::IntrospectionData& introspection)
 {
+  introspection.add(GetAbsoluteGeometry());
 }
 
 }

=== modified file 'dash/previews/SocialPreviewComments.h'
--- dash/previews/SocialPreviewComments.h	2013-01-16 15:43:38 +0000
+++ dash/previews/SocialPreviewComments.h	2013-11-20 14:19:17 +0000
@@ -67,7 +67,7 @@
   void SetupViews();
 
   virtual std::string GetName() const;
-  virtual void AddProperties(GVariantBuilder* builder);
+  virtual void AddProperties(debug::IntrospectionData&);
 
 private:
 

=== modified file 'dash/previews/SocialPreviewContent.cpp'
--- dash/previews/SocialPreviewContent.cpp	2013-11-14 03:00:29 +0000
+++ dash/previews/SocialPreviewContent.cpp	2013-11-20 14:19:17 +0000
@@ -309,8 +309,9 @@
   return "SocialPreviewContent";
 }
 
-void SocialPreviewContent::AddProperties(GVariantBuilder* builder)
+void SocialPreviewContent::AddProperties(debug::IntrospectionData& introspection)
 {
+  introspection.add(GetAbsoluteGeometry());
 }
 
 }

=== modified file 'dash/previews/SocialPreviewContent.h'
--- dash/previews/SocialPreviewContent.h	2013-06-11 21:27:05 +0000
+++ dash/previews/SocialPreviewContent.h	2013-11-20 14:19:17 +0000
@@ -56,7 +56,7 @@
   virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
   virtual void PreLayoutManagement();
-  
+
   virtual bool AcceptKeyNavFocus() { return false; }
 
   void SetupViews();
@@ -73,7 +73,7 @@
                    double   tailWidth);
 
   virtual std::string GetName() const;
-  virtual void AddProperties(GVariantBuilder* builder);
+  virtual void AddProperties(debug::IntrospectionData&);
 
 private:
   nux::ObjectPtr<StaticCairoText> text_;

=== modified file 'dash/previews/Track.cpp'
--- dash/previews/Track.cpp	2013-11-18 18:13:59 +0000
+++ dash/previews/Track.cpp	2013-11-20 14:19:17 +0000
@@ -29,7 +29,6 @@
 #include <unity-shared/IconTexture.h>
 #include <unity-shared/DashStyle.h>
 #include <unity-shared/PreviewStyle.h>
-#include <UnityCore/Variant.h>
 
 namespace unity
 {
@@ -140,9 +139,9 @@
   return "Track";
 }
 
-void Track::AddProperties(GVariantBuilder* builder)
+void Track::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add("uri", uri_)
     .add("play-state", (int)play_state_)
     .add("progress", progress_)

=== modified file 'dash/previews/Track.h'
--- dash/previews/Track.h	2013-07-01 21:17:59 +0000
+++ dash/previews/Track.h	2013-11-20 14:19:17 +0000
@@ -63,7 +63,7 @@
  
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   
   virtual bool AcceptKeyNavFocus() { return false; }
   

=== modified file 'dash/previews/Tracks.cpp'
--- dash/previews/Tracks.cpp	2013-07-01 16:53:52 +0000
+++ dash/previews/Tracks.cpp	2013-11-20 14:19:17 +0000
@@ -27,7 +27,6 @@
 #include "unity-shared/PlacesOverlayVScrollBar.h"
 #include "unity-shared/PreviewStyle.h"
 #include <UnityCore/Track.h>
-#include <UnityCore/Variant.h>
 
 namespace unity
 {
@@ -62,9 +61,9 @@
   return "Tracks";
 }
 
-void Tracks::AddProperties(GVariantBuilder* builder)
+void Tracks::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add("track-count", m_tracks.size());
 }
 

=== modified file 'dash/previews/Tracks.h'
--- dash/previews/Tracks.h	2013-07-01 17:07:26 +0000
+++ dash/previews/Tracks.h	2013-11-20 14:19:17 +0000
@@ -52,10 +52,6 @@
 
   Tracks(dash::Tracks::Ptr tracks, NUX_FILE_LINE_PROTO);
 
-  // From debug::Introspectable
-  std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);  
-
 protected:
   virtual bool AcceptKeyNavFocus() { return false; }
 
@@ -65,6 +61,10 @@
   void OnTrackAdded(dash::Track const& track);
   void OnTrackRemoved(dash::Track const&track);
 
+  // From debug::Introspectable
+  std::string GetName() const;
+  void AddProperties(debug::IntrospectionData&);
+
 protected:
   dash::Tracks::Ptr tracks_;
 

=== modified file 'hud/HudButton.cpp'
--- hud/HudButton.cpp	2013-11-14 03:00:29 +0000
+++ hud/HudButton.cpp	2013-11-20 14:19:17 +0000
@@ -31,7 +31,6 @@
 #include <NuxGraphics/CairoGraphics.h>
 #include <NuxGraphics/NuxGraphics.h>
 #include <UnityCore/GLibWrapper.h>
-#include <UnityCore/Variant.h>
 
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/StaticCairoText.h"
@@ -243,9 +242,9 @@
   return "HudButton";
 }
 
-void HudButton::AddProperties(GVariantBuilder* builder)
+void HudButton::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add("label", label())
     .add("focused", fake_focused());
 }

=== modified file 'hud/HudButton.h'
--- hud/HudButton.h	2012-06-27 21:32:48 +0000
+++ hud/HudButton.h	2013-11-20 14:19:17 +0000
@@ -61,8 +61,8 @@
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
 
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
- 
+  void AddProperties(debug::IntrospectionData&);
+
   void InitTheme();
   void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state);
 

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2013-10-21 13:17:02 +0000
+++ hud/HudController.cpp	2013-11-20 14:19:17 +0000
@@ -369,8 +369,7 @@
   StartShowHideTimeline();
 
   // hide the launcher
-  GVariant* message_data = g_variant_new("(b)", TRUE);
-  ubus.SendMessage(UBUS_LAUNCHER_LOCK_HIDE, message_data);
+  ubus.SendMessage(UBUS_LAUNCHER_LOCK_HIDE, glib::Variant(true));
 
   auto const& view_content_geometry = view_->GetContentGeometry();
   GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "hud", FALSE, monitor_index_,
@@ -415,8 +414,7 @@
   hud_service_.CloseQuery();
 
   //unhide the launcher
-  GVariant* message_data = g_variant_new("(b)", FALSE);
-  ubus.SendMessage(UBUS_LAUNCHER_LOCK_HIDE, message_data);
+  ubus.SendMessage(UBUS_LAUNCHER_LOCK_HIDE, glib::Variant(false));
 
   auto const& view_content_geometry = view_->GetContentGeometry();
   GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "hud", FALSE, monitor_index_,
@@ -505,9 +503,9 @@
   return "HudController";
 }
 
-void Controller::AddProperties(GVariantBuilder* builder)
+void Controller::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(window_ ? window_->GetGeometry() : nux::Geometry())
     .add("ideal_monitor", GetIdealMonitor())
     .add("visible", visible_)

=== modified file 'hud/HudController.h'
--- hud/HudController.h	2013-10-22 16:17:43 +0000
+++ hud/HudController.h	2013-11-20 14:19:17 +0000
@@ -70,7 +70,7 @@
 protected:
   // Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   void EnsureHud();

=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2013-11-14 03:00:29 +0000
+++ hud/HudView.cpp	2013-11-20 14:19:17 +0000
@@ -24,7 +24,6 @@
 #include <glib/gi18n-lib.h>
 #include <NuxCore/Logger.h>
 #include <UnityCore/GLibWrapper.h>
-#include <UnityCore/Variant.h>
 #include <Nux/HLayout.h>
 #include <Nux/VLayout.h>
 
@@ -555,14 +554,13 @@
   return "HudView";
 }
 
-void View::AddProperties(GVariantBuilder* builder)
+void View::AddProperties(debug::IntrospectionData& introspection)
 {
-  unsigned num_buttons = buttons_.size();
-  variant::BuilderWrapper(builder)
-    .add(GetGeometry())
+  introspection
+    .add(GetAbsoluteGeometry())
     .add("selected_button", selected_button_)
     .add("overlay_window_buttons_shown", overlay_window_buttons_->IsVisible())
-    .add("num_buttons", num_buttons);
+    .add("num_buttons", buttons_.size());
 }
 
 debug::Introspectable::IntrospectableList View::GetIntrospectableChildren()

=== modified file 'hud/HudView.h'
--- hud/HudView.h	2013-03-19 17:52:08 +0000
+++ hud/HudView.h	2013-11-20 14:19:17 +0000
@@ -94,7 +94,7 @@
   void SelectLastFocusedButton();
 
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   IntrospectableList GetIntrospectableChildren();
 
 private:

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-10-22 00:07:58 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-11-20 14:19:17 +0000
@@ -25,7 +25,6 @@
 #include <Nux/BaseWindow.h>
 #include <NuxCore/Logger.h>
 
-#include <UnityCore/Variant.h>
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/DesktopUtilities.h>
 
@@ -596,22 +595,20 @@
   return app_->desktop_file();
 }
 
-void ApplicationLauncherIcon::AddProperties(GVariantBuilder* builder)
+void ApplicationLauncherIcon::AddProperties(debug::IntrospectionData& introspection)
 {
-  SimpleLauncherIcon::AddProperties(builder);
-
-  GVariantBuilder xids_builder;
-  g_variant_builder_init(&xids_builder, G_VARIANT_TYPE ("au"));
-
+  SimpleLauncherIcon::AddProperties(introspection);
+
+  std::vector<Window> xids;
   for (auto const& window : GetWindows())
-    g_variant_builder_add(&xids_builder, "u", window->window_id());
+    xids.push_back(window->window_id());
 
-  variant::BuilderWrapper(builder)
+  introspection
     .add("desktop_file", DesktopFile())
     .add("desktop_id", app_->desktop_id())
-    .add("xids", g_variant_builder_end(&xids_builder))
+    .add("xids", static_cast<GVariant*>(glib::Variant::FromVector(xids)))
     .add("sticky", IsSticky())
-    .add("startup_notification_timestamp", (uint64_t)_startup_notification_timestamp);
+    .add("startup_notification_timestamp", _startup_notification_timestamp);
 }
 
 void ApplicationLauncherIcon::OpenInstanceWithUris(std::set<std::string> const& uris, Time timestamp)

=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2013-10-21 23:55:00 +0000
+++ launcher/ApplicationLauncherIcon.h	2013-11-20 14:19:17 +0000
@@ -24,6 +24,7 @@
 #include <UnityCore/GLibSignal.h>
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/ConnectionManager.h>
+#include <UnityCore/Variant.h>
 
 #include <libindicator/indicator-desktop-shortcuts.h>
 
@@ -79,7 +80,7 @@
   void Remove();
   void UpdateIconGeometries(std::vector<nux::Point3> const& centers);
   void OnCenterStabilized(std::vector<nux::Point3> const& centers);
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   void OnAcceptDrop(DndData const& dnd_data);
   void OnDndEnter();
   void OnDndHovered();

=== modified file 'launcher/HudLauncherIcon.cpp'
--- launcher/HudLauncherIcon.cpp	2013-10-22 00:22:37 +0000
+++ launcher/HudLauncherIcon.cpp	2013-11-20 14:19:17 +0000
@@ -19,7 +19,6 @@
 
 #include "HudLauncherIcon.h"
 #include "UnityCore/GLibWrapper.h"
-#include "UnityCore/Variant.h"
 #include <NuxCore/Logger.h>
 
 #include "unity-shared/UBusMessages.h"

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-11-07 20:28:27 +0000
+++ launcher/Launcher.cpp	2013-11-20 14:19:17 +0000
@@ -41,7 +41,6 @@
 #include "unity-shared/UnitySettings.h"
 
 #include <UnityCore/GLibWrapper.h>
-#include <UnityCore/Variant.h>
 
 #include <boost/algorithm/string.hpp>
 
@@ -235,9 +234,9 @@
 }
 #endif
 
-void Launcher::AddProperties(GVariantBuilder* builder)
+void Launcher::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add(GetAbsoluteGeometry())
   .add("hover-progress", hover_animation_.GetCurrentValue())
   .add("dnd-exit-progress", drag_over_animation_.GetCurrentValue())

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2013-10-29 22:39:42 +0000
+++ launcher/Launcher.h	2013-11-20 14:19:17 +0000
@@ -158,7 +158,7 @@
 protected:
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   void ProcessDndEnter();
   void ProcessDndLeave();

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2013-11-07 13:54:18 +0000
+++ launcher/LauncherController.cpp	2013-11-20 14:19:17 +0000
@@ -1420,12 +1420,12 @@
 }
 
 void
-Controller::AddProperties(GVariantBuilder* builder)
+Controller::AddProperties(debug::IntrospectionData& introspection)
 {
   timespec current;
   clock_gettime(CLOCK_MONOTONIC, &current);
 
-  variant::BuilderWrapper(builder)
+  introspection
   .add("key_nav_is_active", KeyNavIsActive())
   .add("key_nav_launcher_monitor", pimpl->keyboard_launcher_.IsValid() ?  pimpl->keyboard_launcher_->monitor : -1)
   .add("key_nav_selection", pimpl->model_->SelectionIndex())

=== modified file 'launcher/LauncherController.h'
--- launcher/LauncherController.h	2013-10-21 18:31:20 +0000
+++ launcher/LauncherController.h	2013-11-20 14:19:17 +0000
@@ -81,7 +81,7 @@
 protected:
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   friend class TestLauncherController;

=== modified file 'launcher/LauncherEntryRemote.cpp'
--- launcher/LauncherEntryRemote.cpp	2013-05-17 22:53:57 +0000
+++ launcher/LauncherEntryRemote.cpp	2013-11-20 14:19:17 +0000
@@ -358,9 +358,9 @@
   return "LauncherEntry";
 }
 
-void LauncherEntryRemote::AddProperties(GVariantBuilder* builder)
+void LauncherEntryRemote::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add("count", Count())
     .add("progress", Progress())
     .add("emblem_visible", EmblemVisible())

=== modified file 'launcher/LauncherEntryRemote.h'
--- launcher/LauncherEntryRemote.h	2013-05-17 22:53:57 +0000
+++ launcher/LauncherEntryRemote.h	2013-11-20 14:19:17 +0000
@@ -67,7 +67,7 @@
 
   // from Introspectable:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   sigc::signal<void, LauncherEntryRemote*, std::string> dbus_name_changed;   // gives the old name as arg
   sigc::signal<void, LauncherEntryRemote*> emblem_changed;

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2013-11-14 03:00:29 +0000
+++ launcher/LauncherIcon.cpp	2013-11-20 14:19:17 +0000
@@ -148,25 +148,20 @@
   return "LauncherIcon";
 }
 
-void
-LauncherIcon::AddProperties(GVariantBuilder* builder)
+void LauncherIcon::AddProperties(debug::IntrospectionData& introspection)
 {
-  GVariantBuilder monitors_builder;
-  g_variant_builder_init(&monitors_builder, G_VARIANT_TYPE ("ab"));
-
+  std::vector<bool> monitors;
   for (unsigned i = 0; i < monitors::MAX; ++i)
-    g_variant_builder_add(&monitors_builder, "b", IsVisibleOnMonitor(i));
+    monitors.push_back(IsVisibleOnMonitor(i));
 
-  unity::variant::BuilderWrapper(builder)
-  .add("center_x", _center[0].x)
-  .add("center_y", _center[0].y)
-  .add("center_z", _center[0].z)
+  introspection
+  .add("center", _center[0])
   .add("related_windows", Windows().size())
   .add("icon_type", unsigned(_icon_type))
   .add("tooltip_text", tooltip_text())
   .add("sort_priority", _sort_priority)
   .add("shortcut", _shortcut)
-  .add("monitors_visibility", g_variant_builder_end(&monitors_builder))
+  .add("monitors_visibility", static_cast<GVariant*>(glib::Variant::FromVector(monitors)))
   .add("active", GetQuirk(Quirk::ACTIVE))
   .add("visible", GetQuirk(Quirk::VISIBLE))
   .add("urgent", GetQuirk(Quirk::URGENT))

=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2013-10-21 23:50:02 +0000
+++ launcher/LauncherIcon.h	2013-11-20 14:19:17 +0000
@@ -213,7 +213,7 @@
 
   std::string GetName() const;
 
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   void FullyAnimateQuirkDelayed(guint ms, Quirk quirk, int monitor = -1);
 

=== modified file 'launcher/LauncherModel.cpp'
--- launcher/LauncherModel.cpp	2013-07-01 21:20:51 +0000
+++ launcher/LauncherModel.cpp	2013-11-20 14:19:17 +0000
@@ -22,7 +22,6 @@
 #include "AbstractLauncherIcon.h"
 
 #include <UnityCore/GLibWrapper.h>
-#include <UnityCore/Variant.h>
 
 namespace unity
 {
@@ -38,9 +37,9 @@
   return "LauncherModel";
 }
 
-void LauncherModel::AddProperties(GVariantBuilder* builder)
+void LauncherModel::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add("selection", selection_);
 }
 

=== modified file 'launcher/LauncherModel.h'
--- launcher/LauncherModel.h	2012-11-28 09:34:44 +0000
+++ launcher/LauncherModel.h	2013-11-20 14:19:17 +0000
@@ -88,7 +88,7 @@
 protected:
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   IntrospectableList GetIntrospectableChildren();
 
 private:

=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2013-10-29 22:33:02 +0000
+++ launcher/MockLauncherIcon.h	2013-11-20 14:19:17 +0000
@@ -83,7 +83,7 @@
 
   std::string GetName() const { return "MockLauncherIcon"; }
 
-  void AddProperties(GVariantBuilder* builder) {}
+  void AddProperties(debug::IntrospectionData& introspection) {}
 
   void ShowTooltip() { is_tooltip_visible_ = true; }
   void HideTooltip() { is_tooltip_visible_ = false; }

=== modified file 'launcher/QuicklistMenuItem.cpp'
--- launcher/QuicklistMenuItem.cpp	2013-06-28 13:46:27 +0000
+++ launcher/QuicklistMenuItem.cpp	2013-11-20 14:19:17 +0000
@@ -20,7 +20,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <UnityCore/Variant.h>
 #include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 
@@ -427,9 +426,9 @@
   return "QuicklistMenuItem";
 }
 
-void QuicklistMenuItem::AddProperties(GVariantBuilder* builder)
+void QuicklistMenuItem::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add(GetAbsoluteGeometry())
   .add("text", _text)
   .add("enabled", GetEnabled())

=== modified file 'launcher/QuicklistMenuItem.h'
--- launcher/QuicklistMenuItem.h	2013-06-28 13:46:27 +0000
+++ launcher/QuicklistMenuItem.h	2013-11-20 14:19:17 +0000
@@ -95,7 +95,7 @@
 protected:
   // Introspection
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   static const int ITEM_INDENT_ABS = 16;
   static const int ITEM_CORNER_RADIUS_ABS = 3;

=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2013-11-01 07:24:38 +0000
+++ launcher/QuicklistView.cpp	2013-11-20 14:19:17 +0000
@@ -28,7 +28,6 @@
 #include <NuxGraphics/GraphicsEngine.h>
 #include <Nux/TextureArea.h>
 #include <NuxGraphics/CairoGraphics.h>
-#include <UnityCore/Variant.h>
 
 #include "unity-shared/CairoTexture.h"
 
@@ -1297,9 +1296,9 @@
   return "Quicklist";
 }
 
-void QuicklistView::AddProperties(GVariantBuilder* builder)
+void QuicklistView::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(GetAbsoluteGeometry())
     .add("base_x", GetBaseX())
     .add("base_y", GetBaseY())

=== modified file 'launcher/QuicklistView.h'
--- launcher/QuicklistView.h	2013-10-03 22:31:18 +0000
+++ launcher/QuicklistView.h	2013-11-20 14:19:17 +0000
@@ -73,7 +73,7 @@
 
   // Introspection
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   IntrospectableList GetIntrospectableChildren();
 
   void EnableQuicklistForTesting(bool enable_testing);

=== modified file 'launcher/SimpleLauncherIcon.cpp'
--- launcher/SimpleLauncherIcon.cpp	2013-11-01 07:24:38 +0000
+++ launcher/SimpleLauncherIcon.cpp	2013-11-20 14:19:17 +0000
@@ -23,7 +23,6 @@
 #include "SimpleLauncherIcon.h"
 
 #include <NuxCore/Logger.h>
-#include <UnityCore/Variant.h>
 
 #include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
@@ -99,10 +98,10 @@
   return "SimpleLauncherIcon";
 }
 
-void SimpleLauncherIcon::AddProperties(GVariantBuilder* builder)
+void SimpleLauncherIcon::AddProperties(debug::IntrospectionData& introspection)
 {
-  LauncherIcon::AddProperties(builder);
-  variant::BuilderWrapper(builder).add("icon_name", icon_name);
+  LauncherIcon::AddProperties(introspection);
+  introspection.add("icon_name", icon_name);
 }
 
 } // namespace launcher

=== modified file 'launcher/SimpleLauncherIcon.h'
--- launcher/SimpleLauncherIcon.h	2013-07-29 16:35:23 +0000
+++ launcher/SimpleLauncherIcon.h	2013-11-20 14:19:17 +0000
@@ -41,7 +41,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   nux::BaseTexture* GetTextureForSize(int size) override;
   virtual void ActivateLauncherIcon(ActionArg arg);

=== modified file 'launcher/SingleMonitorLauncherIcon.cpp'
--- launcher/SingleMonitorLauncherIcon.cpp	2013-10-22 16:17:43 +0000
+++ launcher/SingleMonitorLauncherIcon.cpp	2013-11-20 14:19:17 +0000
@@ -17,8 +17,6 @@
  * Authored by: Marco Trevisan (Treviño) <[e-mail]>
  */
 
-#include <UnityCore/Variant.h>
-
 #include "SingleMonitorLauncherIcon.h"
 
 namespace unity
@@ -58,11 +56,10 @@
   return "SingleMonitorLauncherIcon";
 }
 
-void SingleMonitorLauncherIcon::AddProperties(GVariantBuilder* builder)
+void SingleMonitorLauncherIcon::AddProperties(debug::IntrospectionData& introspection)
 {
-  SimpleLauncherIcon::AddProperties(builder);
-
-  variant::BuilderWrapper(builder).add("monitor", monitor_);
+  SimpleLauncherIcon::AddProperties(introspection);
+  introspection.add("monitor", monitor_);
 }
 
 } // namespace launcher

=== modified file 'launcher/SingleMonitorLauncherIcon.h'
--- launcher/SingleMonitorLauncherIcon.h	2013-10-22 00:21:38 +0000
+++ launcher/SingleMonitorLauncherIcon.h	2013-11-20 14:19:17 +0000
@@ -37,7 +37,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   void UpdateMonitor();

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2013-11-14 03:00:29 +0000
+++ launcher/SwitcherController.cpp	2013-11-20 14:19:17 +0000
@@ -271,9 +271,9 @@
 }
 
 void
-Controller::AddProperties(GVariantBuilder* builder)
+Controller::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add("detail_on_timeout", detail_on_timeout())
   .add("initial_detail_timeout_length", initial_detail_timeout_length())
   .add("detail_timeout_length", detail_timeout_length())

=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2013-09-29 23:26:29 +0000
+++ launcher/SwitcherController.h	2013-11-20 14:19:17 +0000
@@ -127,7 +127,7 @@
 
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   nux::ROProperty<DetailMode> detail_mode;
   nux::Property<int>  timeout_length;

=== modified file 'launcher/SwitcherControllerImpl.h'
--- launcher/SwitcherControllerImpl.h	2013-11-06 11:21:43 +0000
+++ launcher/SwitcherControllerImpl.h	2013-11-20 14:19:17 +0000
@@ -20,7 +20,6 @@
 #include <memory>
 
 #include "AbstractLauncherIcon.h"
-#include <UnityCore/Variant.h>
 #include <UnityCore/GLibSource.h>
 
 #include "unity-shared/Introspectable.h"

=== modified file 'launcher/SwitcherModel.cpp'
--- launcher/SwitcherModel.cpp	2013-08-08 21:31:42 +0000
+++ launcher/SwitcherModel.cpp	2013-11-20 14:19:17 +0000
@@ -20,7 +20,6 @@
 
 #include "SwitcherModel.h"
 #include "unity-shared/WindowManager.h"
-
 #include <UnityCore/Variant.h>
 
 namespace unity
@@ -68,12 +67,13 @@
   return "SwitcherModel";
 }
 
-void SwitcherModel::AddProperties(GVariantBuilder* builder)
+void SwitcherModel::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add("detail-selection", detail_selection)
   .add("detail-selection-index", (int)detail_selection_index)
   .add("detail-current-count", DetailXids().size())
+  .add("detail-windows", static_cast<GVariant*>(glib::Variant::FromVector(DetailXids())))
   .add("only-detail-on-viewport", only_detail_on_viewport)
   .add("selection-index", SelectionIndex())
   .add("last-selection-index", LastSelectionIndex());

=== modified file 'launcher/SwitcherModel.h'
--- launcher/SwitcherModel.h	2013-07-26 18:06:19 +0000
+++ launcher/SwitcherModel.h	2013-11-20 14:19:17 +0000
@@ -106,7 +106,7 @@
 protected:
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   void UpdateRowIndex();

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2013-09-30 16:21:14 +0000
+++ launcher/SwitcherView.cpp	2013-11-20 14:19:17 +0000
@@ -24,7 +24,6 @@
 #include "unity-shared/UScreen.h"
 
 #include <Nux/Nux.h>
-#include <UnityCore/Variant.h>
 
 namespace unity
 {
@@ -102,9 +101,9 @@
   return "SwitcherView";
 }
 
-void SwitcherView::AddProperties(GVariantBuilder* builder)
+void SwitcherView::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add("render-boxes", render_boxes)
   .add("border-size", border_size)
   .add("flat-spacing", flat_spacing)
@@ -114,7 +113,7 @@
   .add("vertical-size", vertical_size)
   .add("text-size", text_size)
   .add("animation-length", animation_length)
-  .add("spread-size", (float)spread_size)
+  .add("spread-size", spread_size)
   .add("label", text_view_->GetText())
   .add("last_icon_selected", last_icon_selected_)
   .add("spread_offset", SPREAD_OFFSET)

=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2013-10-02 23:36:48 +0000
+++ launcher/SwitcherView.h	2013-11-20 14:19:17 +0000
@@ -94,7 +94,7 @@
 protected:
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   IntrospectableList GetIntrospectableChildren();
 
   void PreDraw(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'launcher/Tooltip.cpp'
--- launcher/Tooltip.cpp	2013-11-01 07:24:38 +0000
+++ launcher/Tooltip.cpp	2013-11-20 14:19:17 +0000
@@ -21,7 +21,6 @@
  */
 
 #include <Nux/Nux.h>
-#include <UnityCore/Variant.h>
 
 #include "unity-shared/CairoTexture.h"
 #include <unity-shared/UnitySettings.h>
@@ -555,9 +554,9 @@
   return "ToolTip";
 }
 
-void Tooltip::AddProperties(GVariantBuilder* builder)
+void Tooltip::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add("text", text)
     .add("active", IsVisible())
     .add(GetAbsoluteGeometry());

=== modified file 'launcher/Tooltip.h'
--- launcher/Tooltip.h	2013-10-03 22:30:57 +0000
+++ launcher/Tooltip.h	2013-11-20 14:19:17 +0000
@@ -49,7 +49,7 @@
 
   // Introspection
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   virtual nux::Area* FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type);
 

=== modified file 'panel/PanelController.cpp'
--- panel/PanelController.cpp	2013-11-17 19:45:40 +0000
+++ panel/PanelController.cpp	2013-11-20 14:19:17 +0000
@@ -23,7 +23,6 @@
 #include <vector>
 #include <NuxCore/Logger.h>
 #include <Nux/BaseWindow.h>
-#include <UnityCore/Variant.h>
 
 #include "unity-shared/UScreen.h"
 #include "PanelView.h"
@@ -350,9 +349,9 @@
   return "PanelController";
 }
 
-void Controller::AddProperties(GVariantBuilder* builder)
+void Controller::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add("opacity", pimpl->opacity());
 }
 

=== modified file 'panel/PanelController.h'
--- panel/PanelController.h	2013-11-14 16:08:37 +0000
+++ panel/PanelController.h	2013-11-20 14:19:17 +0000
@@ -60,8 +60,10 @@
 
   bool IsMouseInsideIndicator(nux::Point const& mouse_position) const;
 
+protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
+
 private:
   void OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors);
 

=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2013-11-07 13:54:18 +0000
+++ panel/PanelIndicatorEntryView.cpp	2013-11-20 14:19:17 +0000
@@ -25,7 +25,6 @@
 #include <NuxGraphics/GLThread.h>
 #include <Nux/BaseWindow.h>
 #include <Nux/WindowCompositor.h>
-#include <UnityCore/Variant.h>
 #include <UnityCore/GTKWrapper.h>
 
 #include <glib.h>
@@ -630,7 +629,7 @@
   return "IndicatorEntry";
 }
 
-void PanelIndicatorEntryView::AddProperties(GVariantBuilder* builder)
+void PanelIndicatorEntryView::AddProperties(debug::IntrospectionData& introspection)
 {
   std::string type_name;
 
@@ -646,7 +645,7 @@
       type_name = "other";
   }
 
-  variant::BuilderWrapper(builder)
+  introspection
   .add(GetAbsoluteGeometry())
   .add("entry_id", GetEntryID())
   .add("name_hint", proxy_->name_hint())

=== modified file 'panel/PanelIndicatorEntryView.h'
--- panel/PanelIndicatorEntryView.h	2012-07-09 13:34:41 +0000
+++ panel/PanelIndicatorEntryView.h	2013-11-20 14:19:17 +0000
@@ -89,7 +89,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawEntryPrelight(cairo_t* cr, unsigned int w, unsigned int h);

=== modified file 'panel/PanelIndicatorsView.cpp'
--- panel/PanelIndicatorsView.cpp	2013-07-01 15:43:14 +0000
+++ panel/PanelIndicatorsView.cpp	2013-11-20 14:19:17 +0000
@@ -26,9 +26,6 @@
 
 #include "PanelIndicatorsView.h"
 
-#include <UnityCore/Variant.h>
-#include <glib.h>
-
 DECLARE_LOGGER(logger, "unity.indicators");
 
 namespace unity
@@ -344,9 +341,9 @@
   return "Indicators";
 }
 
-void PanelIndicatorsView::AddProperties(GVariantBuilder* builder)
+void PanelIndicatorsView::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
   .add(GetAbsoluteGeometry())
   .add("entries", entries_.size())
   .add("opacity", opacity);

=== modified file 'panel/PanelIndicatorsView.h'
--- panel/PanelIndicatorsView.h	2013-07-01 15:43:14 +0000
+++ panel/PanelIndicatorsView.h	2013-11-20 14:19:17 +0000
@@ -71,7 +71,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   typedef std::vector<indicator::Indicator::Ptr> Indicators;
   Indicators GetIndicators();

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2013-11-14 03:00:29 +0000
+++ panel/PanelMenuView.cpp	2013-11-20 14:19:17 +0000
@@ -30,8 +30,6 @@
 #include "unity-shared/UScreen.h"
 #include "unity-shared/WindowManager.h"
 
-#include <UnityCore/Variant.h>
-
 #include "config.h"
 #include <glib/gi18n-lib.h>
 
@@ -1502,11 +1500,11 @@
   return "MenuView";
 }
 
-void PanelMenuView::AddProperties(GVariantBuilder* builder)
+void PanelMenuView::AddProperties(debug::IntrospectionData& introspection)
 {
-  PanelIndicatorsView::AddProperties(builder);
+  PanelIndicatorsView::AddProperties(introspection);
 
-  variant::BuilderWrapper(builder)
+  introspection
   .add("mouse_inside", is_inside_)
   .add("grabbed", is_grabbed_)
   .add("active_win_maximized", is_maximized_)

=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2013-07-01 21:30:40 +0000
+++ panel/PanelMenuView.h	2013-11-20 14:19:17 +0000
@@ -60,7 +60,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'panel/PanelTitlebarGrabAreaView.cpp'
--- panel/PanelTitlebarGrabAreaView.cpp	2013-11-14 03:00:29 +0000
+++ panel/PanelTitlebarGrabAreaView.cpp	2013-11-20 14:19:17 +0000
@@ -24,7 +24,6 @@
 
 #include "PanelTitlebarGrabAreaView.h"
 
-#include <UnityCore/Variant.h>
 #include <X11/cursorfont.h>
 
 namespace unity
@@ -175,9 +174,9 @@
 }
 
 void
-PanelTitlebarGrabArea::AddProperties(GVariantBuilder* builder)
+PanelTitlebarGrabArea::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add(GetAbsoluteGeometry())
   .add("grabbed", IsGrabbed());
 }

=== modified file 'panel/PanelTitlebarGrabAreaView.h'
--- panel/PanelTitlebarGrabAreaView.h	2012-06-18 02:57:23 +0000
+++ panel/PanelTitlebarGrabAreaView.h	2013-11-20 14:19:17 +0000
@@ -52,7 +52,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   void OnMouseDown(int x, int y, unsigned long button_flags, unsigned long);

=== modified file 'panel/PanelTray.cpp'
--- panel/PanelTray.cpp	2013-04-10 22:13:31 +0000
+++ panel/PanelTray.cpp	2013-11-20 14:19:17 +0000
@@ -23,7 +23,6 @@
 #include "unity-shared/PanelStyle.h"
 
 #include <NuxCore/Logger.h>
-#include <UnityCore/Variant.h>
 
 DECLARE_LOGGER(logger, "unity.panel.tray");
 namespace
@@ -220,9 +219,9 @@
   return "Tray";
 }
 
-void PanelTray::AddProperties(GVariantBuilder* builder)
+void PanelTray::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
   .add(GetAbsoluteGeometry())
   .add("children_count", children_.size());
 }

=== modified file 'panel/PanelTray.h'
--- panel/PanelTray.h	2013-02-06 12:32:28 +0000
+++ panel/PanelTray.h	2013-11-20 14:19:17 +0000
@@ -51,7 +51,7 @@
 protected:
   void Draw(nux::GraphicsEngine& gfx_content, bool force_draw);
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   bool IdleSync();

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2013-11-14 03:00:29 +0000
+++ panel/PanelView.cpp	2013-11-20 14:19:17 +0000
@@ -38,7 +38,6 @@
 #include "unity-shared/WindowManager.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UScreen.h"
-#include <UnityCore/Variant.h>
 
 #include "PanelIndicatorsView.h"
 
@@ -239,9 +238,9 @@
   return "UnityPanel";
 }
 
-void PanelView::AddProperties(GVariantBuilder* builder)
+void PanelView::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
   .add("backend", "remote")
   .add("monitor", monitor_)
   .add("active", IsActive())

=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2013-10-29 22:39:42 +0000
+++ panel/PanelView.h	2013-11-20 14:19:17 +0000
@@ -84,7 +84,7 @@
 
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   void OnObjectAdded(indicator::Indicator::Ptr const& proxy);
   void OnObjectRemoved(indicator::Indicator::Ptr const& proxy);

=== modified file 'plugins/unityshell/src/ScreenIntrospection.h'
--- plugins/unityshell/src/ScreenIntrospection.h	2012-11-06 18:19:09 +0000
+++ plugins/unityshell/src/ScreenIntrospection.h	2013-11-20 14:19:17 +0000
@@ -35,7 +35,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   IntrospectableList GetIntrospectableChildren();
 
 private:

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-11-17 19:45:40 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-11-20 14:19:17 +0000
@@ -27,7 +27,6 @@
 
 #include <UnityCore/ScopeProxyInterface.h>
 #include <UnityCore/GnomeSessionManager.h>
-#include <UnityCore/Variant.h>
 
 #include "BaseWindowRaiserImp.h"
 #include "IconRenderer.h"
@@ -2553,7 +2552,7 @@
   return result;
 }
 
-void UnityScreen::AddProperties(GVariantBuilder* builder)
+void UnityScreen::AddProperties(debug::IntrospectionData& introspection)
 {}
 
 std::string UnityScreen::GetName() const
@@ -3630,14 +3629,14 @@
 }
 
 
-void UnityWindow::AddProperties(GVariantBuilder* builder)
+void UnityWindow::AddProperties(debug::IntrospectionData& introspection)
 {
   Window xid = window->id();
   auto const& swins = ScaleScreen::get(screen)->getWindows();
   bool scaled = std::find(swins.begin(), swins.end(), ScaleWindow::get(window)) != swins.end();
   WindowManager& wm = WindowManager::Default();
 
-  variant::BuilderWrapper(builder)
+  introspection
     .add(scaled ? GetScaledGeometry() : wm.GetWindowGeometry(xid))
     .add("xid", (uint64_t)xid)
     .add("title", wm.GetWindowName(xid))
@@ -4136,7 +4135,7 @@
   return "Screen";
 }
 
-void ScreenIntrospection::AddProperties(GVariantBuilder* builder)
+void ScreenIntrospection::AddProperties(debug::IntrospectionData& introspection)
 {}
 
 Introspectable::IntrospectableList ScreenIntrospection::GetIntrospectableChildren()

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2013-11-07 13:54:18 +0000
+++ plugins/unityshell/src/unityshell.h	2013-11-20 14:19:17 +0000
@@ -213,7 +213,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   enum CancelActionTarget
@@ -445,7 +445,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   typedef compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>

=== modified file 'shortcuts/ShortcutController.cpp'
--- shortcuts/ShortcutController.cpp	2013-09-24 20:18:42 +0000
+++ shortcuts/ShortcutController.cpp	2013-11-20 14:19:17 +0000
@@ -229,12 +229,12 @@
   return "ShortcutController";
 }
 
-void Controller::AddProperties(GVariantBuilder* builder)
+void Controller::AddProperties(debug::IntrospectionData& introspection)
 {
   bool animating = (fade_animator_.CurrentState() == na::Animation::State::Running);
   auto direction = animation::GetDirection(fade_animator_);
 
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add("timeout_duration", SUPER_TAP_DURATION + FADE_DURATION)
   .add("enabled", IsEnabled())
   .add("about_to_show", (Visible() && animating && direction == animation::Direction::FORWARD))

=== modified file 'shortcuts/ShortcutController.h'
--- shortcuts/ShortcutController.h	2013-09-25 00:47:08 +0000
+++ shortcuts/ShortcutController.h	2013-11-20 14:19:17 +0000
@@ -26,7 +26,6 @@
 #include <Nux/HLayout.h>
 #include <NuxCore/Color.h>
 #include <NuxCore/Animation.h>
-#include <UnityCore/Variant.h>
 #include <UnityCore/GLibSource.h>
 
 #include "BaseWindowRaiser.h"
@@ -61,7 +60,7 @@
 protected:
   // Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   virtual nux::Point GetOffsetPerMonitor(int monitor);
 
 private:

=== modified file 'shutdown/SessionButton.cpp'
--- shutdown/SessionButton.cpp	2013-09-19 00:25:44 +0000
+++ shutdown/SessionButton.cpp	2013-11-20 14:19:17 +0000
@@ -21,7 +21,6 @@
 #include "SessionButton.h"
 
 #include <Nux/VLayout.h>
-#include <UnityCore/Variant.h>
 #include <glib/gi18n-lib.h>
 
 namespace unity
@@ -125,9 +124,9 @@
   return "SessionButton";
 }
 
-void Button::AddProperties(GVariantBuilder* builder)
+void Button::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
     .add("highlighted", highlighted())
     .add("label", label())
     .add("label_color", label_view_->GetTextColor())

=== modified file 'shutdown/SessionButton.h'
--- shutdown/SessionButton.h	2013-03-19 14:53:22 +0000
+++ shutdown/SessionButton.h	2013-11-20 14:19:17 +0000
@@ -60,7 +60,7 @@
 
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   friend class TestSessionButton;

=== modified file 'shutdown/SessionController.cpp'
--- shutdown/SessionController.cpp	2013-09-24 20:18:42 +0000
+++ shutdown/SessionController.cpp	2013-11-20 14:19:17 +0000
@@ -199,9 +199,9 @@
   return "SessionController";
 }
 
-void Controller::AddProperties(GVariantBuilder* builder)
+void Controller::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add("visible", Visible());
 }
 

=== modified file 'shutdown/SessionController.h'
--- shutdown/SessionController.h	2013-09-25 00:47:08 +0000
+++ shutdown/SessionController.h	2013-11-20 14:19:17 +0000
@@ -52,7 +52,7 @@
 protected:
   // Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   friend class TestSessionController;

=== modified file 'shutdown/SessionView.cpp'
--- shutdown/SessionView.cpp	2013-03-25 18:22:32 +0000
+++ shutdown/SessionView.cpp	2013-11-20 14:19:17 +0000
@@ -22,7 +22,6 @@
 
 #include <Nux/VLayout.h>
 #include <UnityCore/GLibWrapper.h>
-#include <UnityCore/Variant.h>
 #include <glib/gi18n-lib.h>
 
 namespace unity
@@ -327,10 +326,10 @@
   return "SessionView";
 }
 
-void View::AddProperties(GVariantBuilder* builder)
+void View::AddProperties(debug::IntrospectionData& introspection)
 {
-  UnityWindowView::AddProperties(builder);
-  variant::BuilderWrapper(builder)
+  UnityWindowView::AddProperties(introspection);
+  introspection
     .add("mode", static_cast<int>(mode()))
     .add("inhibitors", have_inhibitors())
     .add("title",title_->GetText())

=== modified file 'shutdown/SessionView.h'
--- shutdown/SessionView.h	2013-06-14 18:52:41 +0000
+++ shutdown/SessionView.h	2013-11-20 14:19:17 +0000
@@ -66,7 +66,7 @@
 
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   friend class TestSessionView;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-10-07 14:14:49 +0000
+++ tests/CMakeLists.txt	2013-11-20 14:19:17 +0000
@@ -152,6 +152,7 @@
        test_indicator_appmenu.cpp
        test_indicator_entry.cpp
        test_indicators.cpp
+       test_introspection_data.cpp
        test_favorite_store.cpp
        test_favorite_store_gsettings.cpp
        test_favorite_store_private.cpp

=== modified file 'tests/autopilot/unity/emulators/icons.py'
--- tests/autopilot/unity/emulators/icons.py	2012-11-06 18:19:09 +0000
+++ tests/autopilot/unity/emulators/icons.py	2013-11-20 14:19:17 +0000
@@ -24,7 +24,7 @@
     @property
     def center_position(self):
         """Get the center point of an icon, returns a tuple with (x, y, z)."""
-        return (self.center_x, self.center_y, self.center_z)
+        return self.center
 
     def get_quicklist(self):
         """Get the quicklist for this launcher icon.

=== modified file 'tests/autopilot/unity/emulators/launcher.py'
--- tests/autopilot/unity/emulators/launcher.py	2013-10-03 01:33:53 +0000
+++ tests/autopilot/unity/emulators/launcher.py	2013-11-20 14:19:17 +0000
@@ -128,8 +128,8 @@
 
         # Only try 10 times (5 secs.) before giving up.
         for i in xrange(0, 10):
-            mouse_x = target_x = icon.center_x + self.x
-            mouse_y = target_y = icon.center_y
+            mouse_x = target_x = icon.center.x + self.x
+            mouse_y = target_y = icon.center.y
             if target_y > h:
                 mouse_y = h + y - autoscroll_offset
             elif target_y < 0:

=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2013-10-03 13:37:43 +0000
+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2013-11-20 14:19:17 +0000
@@ -62,7 +62,7 @@
     def test_bfb_tooltip_disappear_when_dash_is_opened(self):
         """Tests that the bfb tooltip disappear when the dash is opened."""
         bfb = self.unity.launcher.model.get_bfb_icon()
-        self.mouse.move(bfb.center_x, bfb.center_y)
+        self.mouse.move(bfb.center.x, bfb.center.y)
 
         self.assertThat(lambda: bfb.get_tooltip(), Eventually(NotEquals(None)))
         self.assertThat(bfb.get_tooltip().active, Eventually(Equals(True)))
@@ -77,7 +77,7 @@
         self.addCleanup(self.unity.dash.ensure_hidden)
 
         bfb = self.unity.launcher.model.get_bfb_icon()
-        self.mouse.move(bfb.center_x, bfb.center_y)
+        self.mouse.move(bfb.center.x, bfb.center.y)
 
         # Tooltips are lazy-created  in Unity, so if the BFB tooltip has never
         # been shown before, get_tooltip will return None. If that happens, then
@@ -268,7 +268,7 @@
         self.addCleanup(self.keybinding, "expo/cancel")
 
         bfb = self.unity.launcher.model.get_bfb_icon()
-        self.mouse.move(bfb.center_x, bfb.center_y)
+        self.mouse.move(bfb.center.x, bfb.center.y)
         self.mouse.click(button=3)
 
         self.assertThat(self.launcher_instance.quicklist_open, Eventually(Equals(True)))

=== modified file 'tests/autopilot/unity/tests/launcher/test_scroll.py'
--- tests/autopilot/unity/tests/launcher/test_scroll.py	2013-09-17 15:01:28 +0000
+++ tests/autopilot/unity/tests/launcher/test_scroll.py	2013-11-20 14:19:17 +0000
@@ -63,8 +63,8 @@
         (x_fin, y_fin) = self.mouse.position()
 
         # Make sure we ended up in the center of the last icon
-        self.assertThat(x_fin, Equals(last_icon.center_x))
-        self.assertThat(y_fin, Equals(last_icon.center_y))
+        self.assertThat(x_fin, Equals(last_icon.center.x))
+        self.assertThat(y_fin, Equals(last_icon.center.y))
 
     def test_autoscrolling_from_top(self):
         """Test the autoscrolling from the top of the Launcher"""
@@ -95,5 +95,5 @@
         (x_fin, y_fin) = self.mouse.position()
 
         # Make sure we ended up in the center of the first icon
-        self.assertThat(x_fin, Equals(first_icon.center_x))
-        self.assertThat(y_fin, Equals(first_icon.center_y))
+        self.assertThat(x_fin, Equals(first_icon.center.x))
+        self.assertThat(y_fin, Equals(first_icon.center.y))

=== modified file 'tests/autopilot/unity/tests/launcher/test_tooltips.py'
--- tests/autopilot/unity/tests/launcher/test_tooltips.py	2013-09-12 18:19:21 +0000
+++ tests/autopilot/unity/tests/launcher/test_tooltips.py	2013-11-20 14:19:17 +0000
@@ -41,7 +41,7 @@
         # subsequent tooltips reveal instantly, but hide on exit
         a, b = 0, 1
         while b < size:
-            self.mouse.move(self.icons[b].center_x, self.icons[b].center_y)
+            self.mouse.move(self.icons[b].center.x, self.icons[b].center.y)
             self.assertThat(lambda: self.icons[b].get_tooltip(), Eventually(NotEquals(None)))
             self.assertThat(self.icons[b].get_tooltip().active, Eventually(Equals(True)))
             self.assertThat(lambda: self.icons[a].get_tooltip(), Eventually(NotEquals(None)))
@@ -83,7 +83,7 @@
     (INSTANT, DELAYED, NEVER) = range(3)
 
     def get_reveal_behavior(self, icon):
-        self.mouse.move(icon.center_x, icon.center_y)
+        self.mouse.move(icon.center.x, icon.center.y)
         tooltip = icon.get_tooltip()
         if tooltip and tooltip.active:
             return self.INSTANT

=== modified file 'tests/autopilot/unity/tests/launcher/test_visual.py'
--- tests/autopilot/unity/tests/launcher/test_visual.py	2013-02-04 19:54:47 +0000
+++ tests/autopilot/unity/tests/launcher/test_visual.py	2013-11-20 14:19:17 +0000
@@ -29,7 +29,7 @@
         Tests fix for bug #913569.
         """
         bfb = self.unity.launcher.model.get_bfb_icon()
-        self.mouse.move(bfb.center_x, bfb.center_y)
+        self.mouse.move(bfb.center.x, bfb.center.y)
         self.unity.dash.ensure_visible()
         sleep(1)
         # We can't use 'launcher_instance.switcher_start()' since it moves the mouse.

=== modified file 'tests/autopilot/unity/tests/test_spread.py'
--- tests/autopilot/unity/tests/test_spread.py	2013-10-11 17:26:31 +0000
+++ tests/autopilot/unity/tests/test_spread.py	2013-11-20 14:19:17 +0000
@@ -183,7 +183,7 @@
         """Tests that the screen spread hides the active tooltip."""
         [win] = self.start_test_application_windows("Calculator", 1)
         icon = self.unity.launcher.model.get_icon(desktop_id=win.application.desktop_file)
-        self.mouse.move(icon.center_x, icon.center_y)
+        self.mouse.move(icon.center.x, icon.center.y)
 
         self.assertThat(lambda: icon.get_tooltip(), Eventually(NotEquals(None)))
         self.assertThat(icon.get_tooltip().active, Eventually(Equals(True)))

=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2013-09-27 16:58:29 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2013-11-20 14:19:17 +0000
@@ -552,8 +552,8 @@
 
         # Must collect the cords before moving mouse
         for args in icon_args:
-            x = args.logical_center_x + offset
-            y = args.logical_center_y + offset
+            x = args.logical_center.x + offset
+            y = args.logical_center.y + offset
             icon_cords.append((x,y))
 
         self.unity.switcher.view.break_mouse_bump_detection()

=== modified file 'tests/test_glib_variant.cpp'
--- tests/test_glib_variant.cpp	2013-09-19 13:02:24 +0000
+++ tests/test_glib_variant.cpp	2013-11-20 14:19:17 +0000
@@ -680,6 +680,30 @@
   EXPECT_FALSE(v4.GetVariant());
 }
 
-
+TEST(TestGLibVariant, FromVector)
+{
+  std::vector<int32_t> values(g_random_int_range(1, 10));
+
+  for (unsigned i = 0; i < values.capacity(); ++i)
+    values[i] = g_random_int_range(G_MININT32, G_MAXINT32);
+
+  auto const& variant = Variant::FromVector(values);
+  ASSERT_TRUE(g_variant_is_container(variant));
+  ASSERT_EQ(values.size(), g_variant_n_children(variant));
+  ASSERT_TRUE(g_variant_is_of_type(variant, G_VARIANT_TYPE_ARRAY));
+
+  for (unsigned i = 0; i < values.size(); ++i)
+    ASSERT_EQ(values[i], g_variant_get_int32(g_variant_get_child_value(variant, i)));
+}
+
+TEST(TestGLibVariant, FromVectorEmpty)
+{
+  std::vector<string> empty;
+
+  auto const& variant = Variant::FromVector(empty);
+  ASSERT_TRUE(g_variant_is_container(variant));
+  ASSERT_EQ(0, g_variant_n_children(variant));
+  EXPECT_TRUE(g_variant_is_of_type(variant, G_VARIANT_TYPE_ARRAY));
+}
 
 } // Namespace

=== modified file 'tests/test_hud_controller.cpp'
--- tests/test_hud_controller.cpp	2013-10-14 16:45:07 +0000
+++ tests/test_hud_controller.cpp	2013-11-20 14:19:17 +0000
@@ -54,7 +54,7 @@
   MOCK_METHOD1(ShowEmbeddedIcon, void(bool show));
   MOCK_CONST_METHOD0(default_focus, nux::View*());
   MOCK_CONST_METHOD0(GetName, std::string());
-  MOCK_METHOD1(AddProperties, void(GVariantBuilder*));
+  MOCK_METHOD1(AddProperties, void(debug::IntrospectionData&));
   MOCK_METHOD2(Draw, void(nux::GraphicsEngine&, bool));
   nux::Geometry GetContentGeometry()
   {

=== added file 'tests/test_introspection_data.cpp'
--- tests/test_introspection_data.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_introspection_data.cpp	2013-11-20 14:19:17 +0000
@@ -0,0 +1,300 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2013 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: Marco Trevisan (Treviño) <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+#include "IntrospectionData.h"
+
+namespace
+{
+
+using namespace testing;
+using namespace unity::debug;
+
+GVariant* get_variant_child(GVariant *container, std::size_t index)
+{
+  return g_variant_get_variant(g_variant_get_child_value(container, index));
+}
+
+TEST(TestIntrospectionData, Construction)
+{
+  IntrospectionData data;
+}
+
+TEST(TestIntrospectionData, Get)
+{
+  IntrospectionData data;
+  EXPECT_TRUE(g_variant_is_of_type(data.Get(), G_VARIANT_TYPE("a{sv}")));
+}
+
+TEST(TestIntrospectionData, AddBool)
+{
+  IntrospectionData data;
+  bool value = g_random_int();
+  data.add("Bool", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Bool", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value, g_variant_get_boolean(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddConstChar)
+{
+  IntrospectionData data;
+  const char* value = "ConstCharString";
+  data.add("ConstChar", value);
+  auto tmp = data.Get();
+  GVariant* variant = g_variant_lookup_value(tmp, "ConstChar", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_STREQ(value, g_variant_get_string(get_variant_child(variant, 1), nullptr));
+}
+
+TEST(TestIntrospectionData, AddString)
+{
+  IntrospectionData data;
+  std::string const& value = "StringString";
+  data.add("String", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "String", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value, g_variant_get_string(get_variant_child(variant, 1), nullptr));
+}
+
+TEST(TestIntrospectionData, AddInt16)
+{
+  IntrospectionData data;
+  int16_t value = g_random_int();
+  data.add("Int16", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Int16", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value, g_variant_get_int16(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddInt32)
+{
+  IntrospectionData data;
+  int32_t value = g_random_int();
+  data.add("Int32", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Int32", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value, g_variant_get_int32(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddInt64)
+{
+  IntrospectionData data;
+  int64_t value = g_random_int();
+  data.add("Int64", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Int64", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value, g_variant_get_int64(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddUInt16)
+{
+  IntrospectionData data;
+  uint16_t value = g_random_int();
+  data.add("Uint16", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Uint16", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value, g_variant_get_uint16(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddUInt32)
+{
+  IntrospectionData data;
+  uint32_t value = g_random_int();
+  data.add("Uint32", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Uint32", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value, g_variant_get_uint32(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddUInt64)
+{
+  IntrospectionData data;
+  uint64_t value = g_random_int();
+  data.add("Uint64", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Uint64", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value, g_variant_get_uint64(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddFloat)
+{
+  IntrospectionData data;
+  float value = g_random_double();
+  data.add("Float", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Float", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_FLOAT_EQ(value, g_variant_get_double(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddDouble)
+{
+  IntrospectionData data;
+  double value = g_random_double();
+  data.add("Double", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Double", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_DOUBLE_EQ(value, g_variant_get_double(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddVariant)
+{
+  IntrospectionData data;
+  GVariant* value = g_variant_new_int64(g_random_int());
+  data.add("Variant", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Variant", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(2, g_variant_n_children(variant));
+
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_TRUE(g_variant_equal(value, get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddRect)
+{
+  IntrospectionData data;
+  nux::Rect value(g_random_int(),g_random_int(), g_random_int(), g_random_int());
+  data.add("Rect", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Rect", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(5, g_variant_n_children(variant));
+
+  EXPECT_EQ(1, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value.x, g_variant_get_int32(get_variant_child(variant, 1)));
+  EXPECT_EQ(value.y, g_variant_get_int32(get_variant_child(variant, 2)));
+  EXPECT_EQ(value.width, g_variant_get_int32(get_variant_child(variant, 3)));
+  EXPECT_EQ(value.height, g_variant_get_int32(get_variant_child(variant, 4)));
+}
+
+TEST(TestIntrospectionData, AddRectDefault)
+{
+  IntrospectionData data;
+  nux::Rect value(g_random_int(),g_random_int(), g_random_int(), g_random_int());
+  data.add(value);
+  GVariant* data_variant = data.Get();
+  GVariant* variant = g_variant_lookup_value(data_variant, "globalRect", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(5, g_variant_n_children(variant));
+
+  EXPECT_EQ(1, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value.x, g_variant_get_int32(get_variant_child(variant, 1)));
+  EXPECT_EQ(value.y, g_variant_get_int32(get_variant_child(variant, 2)));
+  EXPECT_EQ(value.width, g_variant_get_int32(get_variant_child(variant, 3)));
+  EXPECT_EQ(value.height, g_variant_get_int32(get_variant_child(variant, 4)));
+
+  variant = g_variant_lookup_value(data_variant, "x", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value.x, g_variant_get_int32(get_variant_child(variant, 1)));
+
+  variant = g_variant_lookup_value(data_variant, "y", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value.y, g_variant_get_int32(get_variant_child(variant, 1)));
+
+  variant = g_variant_lookup_value(data_variant, "width", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value.width, g_variant_get_int32(get_variant_child(variant, 1)));
+
+  variant = g_variant_lookup_value(data_variant, "height", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value.height, g_variant_get_int32(get_variant_child(variant, 1)));
+}
+
+TEST(TestIntrospectionData, AddPoint)
+{
+  IntrospectionData data;
+  nux::Point value(g_random_int(), g_random_int());
+  data.add("Point", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Point", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(3, g_variant_n_children(variant));
+
+  EXPECT_EQ(2, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value.x, g_variant_get_int32(get_variant_child(variant, 1)));
+  EXPECT_EQ(value.y, g_variant_get_int32(get_variant_child(variant, 2)));
+}
+
+TEST(TestIntrospectionData, AddSize)
+{
+  IntrospectionData data;
+  nux::Size value(g_random_int(), g_random_int());
+  data.add("Size", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Size", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(3, g_variant_n_children(variant));
+
+  EXPECT_EQ(3, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(value.width, g_variant_get_int32(get_variant_child(variant, 1)));
+  EXPECT_EQ(value.height, g_variant_get_int32(get_variant_child(variant, 2)));
+}
+
+TEST(TestIntrospectionData, AddColor)
+{
+  IntrospectionData data;
+  nux::Color value(g_random_double(), g_random_double(), g_random_double(), g_random_double());
+  data.add("Color", value);
+  GVariant* variant = g_variant_lookup_value(data.Get(), "Color", nullptr);
+  ASSERT_THAT(variant, NotNull());
+  ASSERT_EQ(5, g_variant_n_children(variant));
+
+  EXPECT_EQ(4, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(static_cast<int32_t>(value.red * 255.), g_variant_get_int32(get_variant_child(variant, 1)));
+  EXPECT_EQ(static_cast<int32_t>(value.green * 255.), g_variant_get_int32(get_variant_child(variant, 2)));
+  EXPECT_EQ(static_cast<int32_t>(value.blue * 255.), g_variant_get_int32(get_variant_child(variant, 3)));
+  EXPECT_EQ(static_cast<int32_t>(value.alpha * 255.), g_variant_get_int32(get_variant_child(variant, 4)));
+}
+
+
+} // Namespace

=== modified file 'unity-shared/AbstractIconRenderer.h'
--- unity-shared/AbstractIconRenderer.h	2013-07-17 21:54:34 +0000
+++ unity-shared/AbstractIconRenderer.h	2013-11-20 14:19:17 +0000
@@ -25,14 +25,12 @@
 #include "Introspectable.h"
 #include "IconTextureSource.h"
 
-#include <UnityCore/Variant.h>
-
 namespace unity
 {
 namespace ui
 {
 
-enum PipRenderStyle 
+enum PipRenderStyle
 {
   OUTSIDE_TILE,
   OVER_TILE,
@@ -98,12 +96,9 @@
 protected:
   // Introspectable methods
   std::string GetName() const { return "RenderArgs"; }
-  void AddProperties(GVariantBuilder* builder)
+  void AddProperties(debug::IntrospectionData& introspection)
   {
-    unity::variant::BuilderWrapper(builder)
-        .add("logical_center_x", logical_center.x)
-        .add("logical_center_y", logical_center.y)
-        .add("logical_center_z", logical_center.z);
+    introspection.add("logical_center", logical_center);
   }
 };
 

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2013-09-03 17:41:09 +0000
+++ unity-shared/CMakeLists.txt	2013-11-20 14:19:17 +0000
@@ -36,6 +36,7 @@
      IconTextureSource.cpp
      Introspectable.cpp
      IntrospectableWrappers.cpp
+     IntrospectionData.cpp
      JSONParser.cpp
      LayoutSystem.cpp
      LineSeparator.cpp

=== modified file 'unity-shared/CoverArt.cpp'
--- unity-shared/CoverArt.cpp	2013-11-14 03:00:29 +0000
+++ unity-shared/CoverArt.cpp	2013-11-20 14:19:17 +0000
@@ -80,9 +80,9 @@
   return "CoverArt";
 }
 
-void CoverArt::AddProperties(GVariantBuilder* builder)
+void CoverArt::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(GetAbsoluteGeometry())
     .add("image-hint", image_hint_)
     .add("waiting", waiting_)
@@ -90,7 +90,7 @@
 }
 
 void CoverArt::SetImage(std::string const& image_hint)
-{ 
+{
   StopWaiting();
 
   if (slot_handle_ > 0)

=== modified file 'unity-shared/CoverArt.h'
--- unity-shared/CoverArt.h	2012-12-14 12:14:34 +0000
+++ unity-shared/CoverArt.h	2013-11-20 14:19:17 +0000
@@ -77,7 +77,7 @@
   void StopWaiting();
 
   virtual std::string GetName() const;
-  virtual void AddProperties(GVariantBuilder* builder);
+  virtual void AddProperties(debug::IntrospectionData&);
 
 private:
   nux::ObjectPtr<nux::BaseTexture> texture_screenshot_;

=== modified file 'unity-shared/DebugDBusInterface.cpp'
--- unity-shared/DebugDBusInterface.cpp	2013-11-06 08:41:02 +0000
+++ unity-shared/DebugDBusInterface.cpp	2013-11-20 14:19:17 +0000
@@ -151,11 +151,9 @@
       if (name == "id")
         return glib::Variant(GetId());
 
-      GVariantBuilder properties_builder;
-      g_variant_builder_init(&properties_builder, G_VARIANT_TYPE("a{sv}"));
-      node_->AddProperties(&properties_builder);
-      glib::Variant props_dict(g_variant_builder_end(&properties_builder));
-      return g_variant_lookup_value(props_dict, name.c_str(), nullptr);
+      IntrospectionData introspection;
+      node_->AddProperties(introspection);
+      return g_variant_lookup_value(glib::Variant(introspection.Get()), name.c_str(), nullptr);
     }
 
     std::vector<xpathselect::Node::Ptr> Children() const

=== modified file 'unity-shared/IconTexture.cpp'
--- unity-shared/IconTexture.cpp	2013-02-13 17:56:54 +0000
+++ unity-shared/IconTexture.cpp	2013-11-20 14:19:17 +0000
@@ -27,7 +27,6 @@
 #include <NuxCore/Logger.h>
 #include <NuxGraphics/GLThread.h>
 #include <UnityCore/GLibWrapper.h>
-#include <UnityCore/Variant.h>
 
 #include "IconLoader.h"
 #include "IconTexture.h"
@@ -322,11 +321,10 @@
 }
 
 
-void IconTexture::AddProperties(GVariantBuilder* builder)
+void IconTexture::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
-  .add(GetGeometry())
-  .add("icon_name", _icon_name);
+  introspection.add(GetAbsoluteGeometry())
+               .add("icon_name", _icon_name);
 }
 
 //

=== modified file 'unity-shared/IconTexture.h'
--- unity-shared/IconTexture.h	2013-02-13 17:34:32 +0000
+++ unity-shared/IconTexture.h	2013-11-20 14:19:17 +0000
@@ -78,7 +78,7 @@
   bool _accept_key_nav_focus;
 
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   virtual bool DoCanFocus();
   glib::Object<GdkPixbuf> _pixbuf_cached;
 

=== modified file 'unity-shared/Introspectable.cpp'
--- unity-shared/Introspectable.cpp	2013-09-19 13:43:14 +0000
+++ unity-shared/Introspectable.cpp	2013-11-20 14:19:17 +0000
@@ -46,17 +46,14 @@
   return children_;
 }
 
-GVariant*
-Introspectable::Introspect()
+GVariant* Introspectable::Introspect()
 {
-  GVariantBuilder builder;
   GVariantBuilder child_builder;
   bool has_valid_children = false;
 
-  g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
-  variant::BuilderWrapper build_wrapper(&builder);
-  build_wrapper.add("id", id_);
-  AddProperties(&builder);
+  IntrospectionData data;
+  data.add("id", id_);
+  AddProperties(data);
 
   g_variant_builder_init(&child_builder, G_VARIANT_TYPE("as"));
 
@@ -74,20 +71,18 @@
   glib::Variant child_results(g_variant_builder_end(&child_builder));
 
   if (has_valid_children)
-    build_wrapper.add(CHILDREN_NAME, child_results);
+    data.add(CHILDREN_NAME, static_cast<GVariant*>(child_results));
 
-  return g_variant_builder_end(&builder);
+  return data.Get();
 }
 
-void
-Introspectable::AddChild(Introspectable* child)
+void Introspectable::AddChild(Introspectable* child)
 {
   children_.push_back(child);
   child->parents_.push_back(this);
 }
 
-void
-Introspectable::RemoveChild(Introspectable* child)
+void Introspectable::RemoveChild(Introspectable* child)
 {
   children_.remove(child);
   child->parents_.remove(this);

=== modified file 'unity-shared/Introspectable.h'
--- unity-shared/Introspectable.h	2013-09-19 20:20:58 +0000
+++ unity-shared/Introspectable.h	2013-11-20 14:19:17 +0000
@@ -20,7 +20,7 @@
 #ifndef _INTROSPECTABLE_H
 #define _INTROSPECTABLE_H
 
-#include <glib.h>
+#include "IntrospectionData.h"
 #include <list>
 #include <string>
 
@@ -39,7 +39,7 @@
   virtual std::string GetName() const = 0;
   void AddChild(Introspectable* child);
   void RemoveChild(Introspectable* child);
-  virtual void AddProperties(GVariantBuilder* builder) = 0;
+  virtual void AddProperties(debug::IntrospectionData&) = 0;
   virtual IntrospectableList GetIntrospectableChildren();
   int32_t GetIntrospectionId() const;
 

=== modified file 'unity-shared/IntrospectableWrappers.cpp'
--- unity-shared/IntrospectableWrappers.cpp	2012-10-11 01:44:15 +0000
+++ unity-shared/IntrospectableWrappers.cpp	2013-11-20 14:19:17 +0000
@@ -17,15 +17,13 @@
  * Authored by: Thomi Richards <[e-mail]>
  */
 
-#include <UnityCore/Variant.h>
-
 #include "IntrospectableWrappers.h"
 
 namespace unity
 {
 namespace debug
 {
-  
+
 ResultWrapper::ResultWrapper(dash::Result const& result, nux::Geometry const& geo)
 : uri_(result.uri),
   name_(result.name),
@@ -40,9 +38,9 @@
   return "Result";
 }
 
-void ResultWrapper::AddProperties(GVariantBuilder* builder)
+void ResultWrapper::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
     .add("uri", uri_)
     .add("name", name_)
     .add("icon_hint", icon_hint_)

=== modified file 'unity-shared/IntrospectableWrappers.h'
--- unity-shared/IntrospectableWrappers.h	2012-10-11 01:44:15 +0000
+++ unity-shared/IntrospectableWrappers.h	2013-11-20 14:19:17 +0000
@@ -38,7 +38,7 @@
 public:
   ResultWrapper(const dash::Result& result, nux::Geometry const& geo = nux::Geometry());
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   void UpdateGeometry(nux::Geometry const& geo);
 

=== added file 'unity-shared/IntrospectionData.cpp'
--- unity-shared/IntrospectionData.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/IntrospectionData.cpp	2013-11-20 14:19:17 +0000
@@ -0,0 +1,197 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2013 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: Marco Trevisan <[e-mail]>
+ */
+
+#include "IntrospectionData.h"
+#include <UnityCore/Variant.h>
+
+namespace unity
+{
+namespace debug
+{
+using namespace glib;
+
+enum class ValueType : uint32_t
+{
+  // This should match the Autopilot Type IDs
+  SIMPLE = 0,
+  RECTANGLE = 1,
+  POINT = 2,
+  SIZE = 3,
+  COLOR = 4,
+  DATE = 5,
+  TIME = 6,
+  POINT3D = 7,
+};
+
+IntrospectionData::IntrospectionData()
+  : builder_(g_variant_builder_new(G_VARIANT_TYPE("a{sv}")))
+{}
+
+IntrospectionData::~IntrospectionData()
+{
+  g_clear_pointer(&builder_, g_variant_builder_unref);
+}
+
+GVariant* IntrospectionData::Get() const
+{
+  GVariant* data = g_variant_builder_end(builder_);
+  g_clear_pointer(&builder_, g_variant_builder_unref);
+  return data;
+}
+
+void add_(GVariantBuilder* builder_, std::string const& name, ValueType type, std::vector<Variant> const& values)
+{
+  GVariantBuilder array;
+  g_variant_builder_init(&array, G_VARIANT_TYPE("av"));
+  g_variant_builder_add(&array, "v", g_variant_new_uint32(static_cast<uint32_t>(type)));
+
+  for (auto const& value : values)
+    g_variant_builder_add(&array, "v", static_cast<GVariant*>(value));
+
+  g_variant_builder_add(builder_, "{sv}", name.c_str(), g_variant_builder_end(&array));
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, bool value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, char const* value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, std::string const& value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, int16_t value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, int32_t value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, int64_t value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, uint16_t value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, uint32_t value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, uint64_t value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+#if __WORDSIZE != 64
+IntrospectionData& IntrospectionData::add(std::string const& name, long value)
+{
+  return add(name, static_cast<int64_t>(value));
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, unsigned long value)
+{
+  return add(name, static_cast<uint64_t>(value));
+}
+#endif
+
+IntrospectionData& IntrospectionData::add(std::string const& name, float value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, double value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, GVariant* value)
+{
+  add_(builder_, name, ValueType::SIMPLE, {Variant(value)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, nux::Rect const& r)
+{
+  add_(builder_, name, ValueType::RECTANGLE, {Variant(r.x), Variant(r.y), Variant(r.width), Variant(r.height)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, nux::Point const& p)
+{
+  add_(builder_, name, ValueType::POINT, {Variant(p.x), Variant(p.y)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, nux::Point3 const& p)
+{
+  add_(builder_, name, ValueType::POINT3D, {Variant(p.x), Variant(p.y), Variant(p.z)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, nux::Size const& s)
+{
+  add_(builder_, name, ValueType::SIZE, {Variant(s.width), Variant(s.height)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(std::string const& name, nux::Color const& c)
+{
+  int32_t r = c.red * 255.0f, g = c.green * 255.0f, b = c.blue * 255.0f, a = c.alpha * 255.0f;
+  add_(builder_, name, ValueType::COLOR, {Variant(r), Variant(g), Variant(b), Variant(a)});
+  return *this;
+}
+
+IntrospectionData& IntrospectionData::add(nux::Rect const& value)
+{
+  add("globalRect", value);
+  // Legacy support
+  add("x", value.x);
+  add("y", value.y);
+  add("width", value.width);
+  add("height", value.height);
+  return *this;
+}
+
+} // debug namespace
+} // unity namespace

=== added file 'unity-shared/IntrospectionData.h'
--- unity-shared/IntrospectionData.h	1970-01-01 00:00:00 +0000
+++ unity-shared/IntrospectionData.h	2013-11-20 14:19:17 +0000
@@ -0,0 +1,72 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2013 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: Marco Trevisan <[e-mail]>
+ */
+
+#ifndef UNITY_DEBUG_INTROSPECTION_DATA
+#define UNITY_DEBUG_INTROSPECTION_DATA
+
+#include <string>
+#include <glib.h>
+#include <NuxCore/Rect.h>
+#include <NuxCore/Color.h>
+#include <NuxCore/Math/Point3D.h>
+
+namespace unity
+{
+namespace debug
+{
+
+class IntrospectionData
+{
+public:
+  IntrospectionData();
+  ~IntrospectionData();
+
+  IntrospectionData& add(std::string const& name, bool);
+  IntrospectionData& add(std::string const& name, const char*);
+  IntrospectionData& add(std::string const& name, std::string const&);
+  IntrospectionData& add(std::string const& name, int16_t);
+  IntrospectionData& add(std::string const& name, int32_t);
+  IntrospectionData& add(std::string const& name, int64_t);
+  IntrospectionData& add(std::string const& name, uint16_t);
+  IntrospectionData& add(std::string const& name, uint32_t);
+  IntrospectionData& add(std::string const& name, uint64_t);
+#if __WORDSIZE != 64
+  IntrospectionData& add(std::string const& name, long);
+  IntrospectionData& add(std::string const& name, unsigned long);
+#endif
+  IntrospectionData& add(std::string const& name, float);
+  IntrospectionData& add(std::string const& name, double);
+  IntrospectionData& add(std::string const& name, GVariant*);
+  IntrospectionData& add(std::string const& name, nux::Rect const&);
+  IntrospectionData& add(std::string const& name, nux::Point const&);
+  IntrospectionData& add(std::string const& name, nux::Point3 const&);
+  IntrospectionData& add(std::string const& name, nux::Size const&);
+  IntrospectionData& add(std::string const& name, nux::Color const&);
+  IntrospectionData& add(nux::Rect const&);
+
+  GVariant* Get() const;
+
+private:
+  GVariantBuilder* builder_;
+};
+
+} // debug namespace
+} // unity namespace
+
+#endif // UNITY_DEBUG_INTROSPECTION
\ No newline at end of file

=== modified file 'unity-shared/LayoutSystem.cpp'
--- unity-shared/LayoutSystem.cpp	2013-07-18 17:34:01 +0000
+++ unity-shared/LayoutSystem.cpp	2013-11-20 14:19:17 +0000
@@ -19,8 +19,6 @@
 
 #include "LayoutSystem.h"
 
-#include <UnityCore/Variant.h>
-
 namespace unity {
 namespace ui {
 
@@ -298,10 +296,9 @@
   return "LayoutWindow";
 }
 
-void LayoutWindow::AddProperties(GVariantBuilder* builder)
+void LayoutWindow::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
-    .add(result);
+  introspection.add(result);
 }
 
 }

=== modified file 'unity-shared/LayoutSystem.h'
--- unity-shared/LayoutSystem.h	2013-07-18 17:34:01 +0000
+++ unity-shared/LayoutSystem.h	2013-11-20 14:19:17 +0000
@@ -51,7 +51,7 @@
 protected:
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 };
 
 class LayoutSystem

=== modified file 'unity-shared/OverlayWindowButtons.cpp'
--- unity-shared/OverlayWindowButtons.cpp	2013-11-14 03:00:29 +0000
+++ unity-shared/OverlayWindowButtons.cpp	2013-11-20 14:19:17 +0000
@@ -98,7 +98,9 @@
   return "OverlayWindowButtons";
 }
 
-void OverlayWindowButtons::AddProperties(GVariantBuilder* builder)
-{}
+void OverlayWindowButtons::AddProperties(debug::IntrospectionData& introspection)
+{
+  introspection.add(GetAbsoluteGeometry());
+}
 
 } // namespace unity

=== modified file 'unity-shared/OverlayWindowButtons.h'
--- unity-shared/OverlayWindowButtons.h	2013-04-17 15:10:39 +0000
+++ unity-shared/OverlayWindowButtons.h	2013-11-20 14:19:17 +0000
@@ -44,8 +44,8 @@
   void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
 
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
-  
+  void AddProperties(debug::IntrospectionData&);
+
 private:
   void UpdateGeometry();
 

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2013-10-30 21:29:38 +0000
+++ unity-shared/PluginAdapter.cpp	2013-11-20 14:19:17 +0000
@@ -23,7 +23,6 @@
 #include "UScreen.h"
 
 #include <NuxCore/Logger.h>
-#include <UnityCore/Variant.h>
 
 namespace unity
 {
@@ -1544,12 +1543,11 @@
     _last_focused_window = NULL;
 }
 
-void PluginAdapter::AddProperties(GVariantBuilder* builder)
+void PluginAdapter::AddProperties(debug::IntrospectionData& wrapper)
 {
-  unity::variant::BuilderWrapper wrapper(builder);
   wrapper.add(GetScreenGeometry())
          .add("workspace_count", WorkspaceCount())
-         .add("active_window", (uint64_t)GetActiveWindow())
+         .add("active_window", GetActiveWindow())
          .add("screen_grabbed", IsScreenGrabbed())
          .add("scale_active", IsScaleActive())
          .add("scale_active_for_group", IsScaleActiveForGroup())

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2013-09-14 09:56:10 +0000
+++ unity-shared/PluginAdapter.h	2013-11-20 14:19:17 +0000
@@ -204,7 +204,7 @@
 
 protected:
   PluginAdapter(CompScreen* screen);
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   std::string MatchStringForXids(std::vector<Window> const& windows);

=== modified file 'unity-shared/RatingsButton.cpp'
--- unity-shared/RatingsButton.cpp	2013-11-14 03:00:29 +0000
+++ unity-shared/RatingsButton.cpp	2013-11-20 14:19:17 +0000
@@ -23,7 +23,6 @@
 
 #include <Nux/Nux.h>
 #include <NuxCore/Logger.h>
-#include <UnityCore/Variant.h>
 
 #include "RatingsButton.h"
 #include "DashStyle.h"
@@ -280,9 +279,9 @@
   return "RatingsButton";
 }
 
-void RatingsButton::AddProperties(GVariantBuilder* builder)
+void RatingsButton::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder)
+  introspection
     .add(GetAbsoluteGeometry())
     .add("rating", rating_)
     .add("focused-star", focused_star_)

=== modified file 'unity-shared/RatingsButton.h'
--- unity-shared/RatingsButton.h	2012-08-22 10:03:52 +0000
+++ unity-shared/RatingsButton.h	2013-11-20 14:19:17 +0000
@@ -50,7 +50,7 @@
 
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   void OnKeyDown(unsigned long event_type, unsigned long event_keysym,

=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2013-11-14 03:00:29 +0000
+++ unity-shared/SearchBar.cpp	2013-11-20 14:19:17 +0000
@@ -24,8 +24,6 @@
 #include <Nux/VLayout.h>
 #include <NuxCore/Logger.h>
 
-#include <UnityCore/Variant.h>
-
 #include <glib/gi18n-lib.h>
 
 #include "SearchBar.h"
@@ -605,9 +603,9 @@
   return "SearchBar";
 }
 
-void SearchBar::AddProperties(GVariantBuilder* builder)
+void SearchBar::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add(GetAbsoluteGeometry())
   .add("has_focus", pango_entry_->HasKeyFocus())
   .add("search_string", pango_entry_->GetText())

=== modified file 'unity-shared/SearchBar.h'
--- unity-shared/SearchBar.h	2013-03-22 20:19:42 +0000
+++ unity-shared/SearchBar.h	2013-11-20 14:19:17 +0000
@@ -95,7 +95,7 @@
   bool show_filter_hint_;
 
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   bool AcceptKeyNavFocus();
 
 private:

=== modified file 'unity-shared/SearchBarSpinner.cpp'
--- unity-shared/SearchBarSpinner.cpp	2013-11-14 03:00:29 +0000
+++ unity-shared/SearchBarSpinner.cpp	2013-11-20 14:19:17 +0000
@@ -20,7 +20,6 @@
 #include "SearchBarSpinner.h"
 
 #include <Nux/VLayout.h>
-#include <UnityCore/Variant.h>
 
 #include "unity-shared/DashStyle.h"
 
@@ -197,15 +196,9 @@
   return "SearchBarSpinner";
 }
 
-void SearchBarSpinner::AddProperties(GVariantBuilder* builder)
+void SearchBarSpinner::AddProperties(debug::IntrospectionData& introspection)
 {
-  nux::Geometry geo = GetGeometry();
-
-  variant::BuilderWrapper(builder)
-    .add("x", geo.x)
-    .add("y", geo.y)
-    .add("width", geo.width)
-    .add("height", geo.height);
+  introspection.add(GetAbsoluteGeometry());
 }
 
 //

=== modified file 'unity-shared/SearchBarSpinner.h'
--- unity-shared/SearchBarSpinner.h	2012-12-18 13:38:18 +0000
+++ unity-shared/SearchBarSpinner.h	2013-11-20 14:19:17 +0000
@@ -55,7 +55,7 @@
 protected:
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
   // Key navigation
   virtual bool AcceptKeyNavFocus();

=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2013-10-14 16:33:24 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2013-11-20 14:19:17 +0000
@@ -25,7 +25,6 @@
 #include "UScreen.h"
 
 #include <NuxCore/Logger.h>
-#include <UnityCore/Variant.h>
 
 // Entirely stubs for now, unless we need this functionality at some point
 
@@ -698,12 +697,11 @@
   current_vp_ = vp;
 }
 
-void StandaloneWindowManager::AddProperties(GVariantBuilder* builder)
+void StandaloneWindowManager::AddProperties(debug::IntrospectionData& wrapper)
 {
-  unity::variant::BuilderWrapper wrapper(builder);
   wrapper.add(GetScreenGeometry())
          .add("workspace_count", WorkspaceCount())
-         .add("active_window", (uint64_t)GetActiveWindow())
+         .add("active_window", GetActiveWindow())
          .add("screen_grabbed", IsScreenGrabbed())
          .add("scale_active", IsScaleActive())
          .add("scale_active_for_group", IsScaleActiveForGroup())

=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2013-10-14 16:33:24 +0000
+++ unity-shared/StandaloneWindowManager.h	2013-11-20 14:19:17 +0000
@@ -171,7 +171,7 @@
   void ResetStatus();
 
 protected:
-  virtual void AddProperties(GVariantBuilder* builder);
+  virtual void AddProperties(debug::IntrospectionData&);
 
 private:
   bool expo_state_;

=== modified file 'unity-shared/StaticCairoText.cpp'
--- unity-shared/StaticCairoText.cpp	2013-10-08 18:10:36 +0000
+++ unity-shared/StaticCairoText.cpp	2013-11-20 14:19:17 +0000
@@ -34,7 +34,6 @@
 #include <pango/pangocairo.h>
 
 #include <UnityCore/GLibWrapper.h>
-#include <UnityCore/Variant.h>
 
 #include "CairoTexture.h"
 
@@ -509,11 +508,10 @@
   return "StaticCairoText";
 }
 
-void StaticCairoText::AddProperties(GVariantBuilder* builder)
+void StaticCairoText::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
-  .add(GetGeometry())
-  .add("text", pimpl->text_);
+  introspection.add(GetAbsoluteGeometry())
+               .add("text", pimpl->text_);
 }
 
 std::string StaticCairoText::Impl::GetEffectiveFont() const

=== modified file 'unity-shared/StaticCairoText.h'
--- unity-shared/StaticCairoText.h	2013-01-22 12:37:28 +0000
+++ unity-shared/StaticCairoText.h	2013-11-20 14:19:17 +0000
@@ -117,7 +117,7 @@
 
   // From debug::Introspectable
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   struct Impl;

=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2013-11-14 03:00:29 +0000
+++ unity-shared/TextInput.cpp	2013-11-20 14:19:17 +0000
@@ -301,9 +301,9 @@
   return "TextInput";
 }
 
-void TextInput::AddProperties(GVariantBuilder* builder)
+void TextInput::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
+  introspection
   .add(GetAbsoluteGeometry())
   .add("has_focus", pango_entry_->HasKeyFocus())
   .add("input_string", pango_entry_->GetText())

=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2013-01-03 11:13:37 +0000
+++ unity-shared/TextInput.h	2013-11-20 14:19:17 +0000
@@ -34,7 +34,6 @@
 #include <NuxCore/Property.h>
 #include <UnityCore/GLibSignal.h>
 #include <UnityCore/GLibSource.h>
-#include <UnityCore/Variant.h>
 
 #include "CairoTexture.h"
 #include "unity-shared/IconTexture.h"
@@ -75,7 +74,7 @@
 
   std::string GetName() const;
 
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
   bool AcceptKeyNavFocus();
 
 protected:

=== modified file 'unity-shared/UnityWindowView.cpp'
--- unity-shared/UnityWindowView.cpp	2013-11-12 16:21:13 +0000
+++ unity-shared/UnityWindowView.cpp	2013-11-20 14:19:17 +0000
@@ -18,8 +18,6 @@
  *              Marco Trevisan <[e-mail]>
  */
 
-#include <UnityCore/Variant.h>
-
 #include "UnityWindowView.h"
 #include <Nux/VLayout.h>
 #include "unity-shared/UnitySettings.h"
@@ -420,10 +418,12 @@
   return "UnityWindowView";
 }
 
-void UnityWindowView::AddProperties(GVariantBuilder* builder)
+void UnityWindowView::AddProperties(debug::IntrospectionData& introspection)
 {
-  unity::variant::BuilderWrapper(builder)
-    .add("bg-texture-is-valid", bg_texture_.IsValid());
+  introspection
+    .add("bg-texture-is-valid", bg_texture_.IsValid())
+    .add("closable", closable())
+    .add("close_geo", close_button_ ? close_button_->GetGeometry() : nux::Geometry());
 }
 
 

=== modified file 'unity-shared/UnityWindowView.h'
--- unity-shared/UnityWindowView.h	2013-03-07 16:48:26 +0000
+++ unity-shared/UnityWindowView.h	2013-11-20 14:19:17 +0000
@@ -64,7 +64,7 @@
 
   // Introspectable methods
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   friend class TestUnityWindowView;

=== modified file 'unity-shared/WindowButtonPriv.h'
--- unity-shared/WindowButtonPriv.h	2013-01-28 23:35:47 +0000
+++ unity-shared/WindowButtonPriv.h	2013-11-20 14:19:17 +0000
@@ -49,7 +49,7 @@
 protected:
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   void UpdateSize();

=== modified file 'unity-shared/WindowButtons.cpp'
--- unity-shared/WindowButtons.cpp	2013-11-14 03:00:29 +0000
+++ unity-shared/WindowButtons.cpp	2013-11-20 14:19:17 +0000
@@ -24,7 +24,6 @@
 #include <array>
 
 #include <UnityCore/GLibWrapper.h>
-#include <UnityCore/Variant.h>
 
 #include "WindowButtons.h"
 #include "WindowButtonPriv.h"
@@ -206,7 +205,7 @@
   return "WindowButton";
 }
 
-void WindowButton::AddProperties(GVariantBuilder* builder)
+void WindowButton::AddProperties(debug::IntrospectionData& introspection)
 {
   std::string type_name;
   std::string state_name;
@@ -239,7 +238,7 @@
       state_name = "normal";
   }
 
-  variant::BuilderWrapper(builder).add(GetAbsoluteGeometry())
+  introspection.add(GetAbsoluteGeometry())
                                   .add("type", type_name)
                                   .add("visible", IsVisible() && Parent()->opacity() != 0.0f)
                                   .add("sensitive", Parent()->GetInputEventSensitivity())
@@ -651,15 +650,15 @@
   return "WindowButtons";
 }
 
-void WindowButtons::AddProperties(GVariantBuilder* builder)
+void WindowButtons::AddProperties(debug::IntrospectionData& introspection)
 {
-  variant::BuilderWrapper(builder).add(GetAbsoluteGeometry())
-                                  .add("monitor", monitor())
-                                  .add("opacity", opacity())
-                                  .add("visible", opacity() != 0.0f)
-                                  .add("sensitive", GetInputEventSensitivity())
-                                  .add("focused", focused())
-                                  .add("controlled_window", (guint64)controlled_window());
+  introspection.add(GetAbsoluteGeometry())
+               .add("monitor", monitor())
+               .add("opacity", opacity())
+               .add("visible", opacity() != 0.0f)
+               .add("sensitive", GetInputEventSensitivity())
+               .add("focused", focused())
+               .add("controlled_window", controlled_window());
 }
 
 } // unity namespace

=== modified file 'unity-shared/WindowButtons.h'
--- unity-shared/WindowButtons.h	2013-01-28 23:35:47 +0000
+++ unity-shared/WindowButtons.h	2013-11-20 14:19:17 +0000
@@ -55,7 +55,7 @@
 
 protected:
   std::string GetName() const;
-  void AddProperties(GVariantBuilder* builder);
+  void AddProperties(debug::IntrospectionData&);
 
 private:
   void OnCloseClicked(nux::Button *button);

=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2013-09-24 20:08:35 +0000
+++ unity-shared/WindowManager.h	2013-11-20 14:19:17 +0000
@@ -195,7 +195,7 @@
 
 protected:
   std::string GetName() const;
-  virtual void AddProperties(GVariantBuilder* builder) = 0;
+  virtual void AddProperties(debug::IntrospectionData& introspection) = 0;
 
 };