Merge lp:~3v1n0/bamf/bamfdaemon-gdbus into lp:bamf/0.4

[Marco Trevisan (Treviño)]

Ported the BAMF daemon to GDBus, using gdbus-codegen to generate most of the low-level code.

The BamfMatcher and BamfControl are directly extending the generated skeleton class, while the Views are now extending the generated BamfDBusItemObjectSkeleton class, so it has been easily possible to transform each subclass into a kind of proxy to the generated skeleton interface. To reduce code redundancy for initializing signals, some view classes are also implementing the related skeleton interface, but this has been done only for convenience.

Then, I've added a BamfDaemon class to handle the daemon initialization and termination, and I've updated the tests against the new internal APIs.

Finally, I've also ported all the code for indicators and tabs, while I guess that this is now quite obsolete (the indicator part shouldn't totally, but the tabs really are), so maybe it could safely be removed.

I also want to make clear that the public DBus API interface has not been touched by this porting, so the new bamfdaemon can safely replace the old one (in fact I'm using it on my PC for some days with no crashes or unexpected behavior).

The port of libbamf will begin soon as well, and doing that maybe we should refine also the DBus interface.

PS: of course I've also included some random code fixes and cleanup.

[Michal Hruby (mhr3)]

A few things from a quick look: (in merge request line numbers)

1) please enable silent rules

339 + const GList *children, *l;

Please get rid of the const, this isn't C++ and afaict it's wrong in this case. (same for 405, 439, 449, 490, ...)

Same applies to methods returning const GList* - in that case the qualifier is correct, but all GList methods require non-const list anyway, so you're forcing the consumer to cast away the const-ness.

1335 + g_error_free (error);
1336 + error = NULL;

There are also multiple instances of this and it can be simplified using g_clear_error().

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

Thanks for your review. I've made the changes you suggested to me.

Also, I've disabled the indicator approver, since it is currently deprecated (after a chat with Ted).

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/14/console reported an error when processing this lp:~3v1n0/bamf/bamfdaemon-gdbus branch.
Not merging it.

[Jason Smith (jassmith)]

Works for me, please fix jenkins issues :)

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

Marking branch approved again. I have no idea why jenkins silently fails...

[Unity Merger (unity-merger)]

Attempt to merge into lp:bamf failed due to conflicts:

text conflict in configure.in

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/24/console reported an error when processing this lp:~3v1n0/bamf/bamfdaemon-gdbus branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/25/console reported an error when processing this lp:~3v1n0/bamf/bamfdaemon-gdbus branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/26/console reported an error when processing this lp:~3v1n0/bamf/bamfdaemon-gdbus branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/27/console reported an error when processing this lp:~3v1n0/bamf/bamfdaemon-gdbus branch.
Not merging it.

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/28/console reported an error when processing this lp:~3v1n0/bamf/bamfdaemon-gdbus branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/29/console reported an error when processing this lp:~3v1n0/bamf/bamfdaemon-gdbus branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/30/console reported an error when processing this lp:~3v1n0/bamf/bamfdaemon-gdbus branch.
Not merging it.

[lp:~3v1n0/bamf/bamfdaemon-gdbus]

450. By Marco Trevisan (Treviño) on 2012-01-19

tests, BamfDaemon: removed typo.

=== modified file 'configure.in'
--- configure.in	2012-01-12 15:08:42 +0000
+++ configure.in	2012-01-19 19:16:25 +0000
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT(bamf, 0.2.106, [e-mail])
+AC_INIT(bamf, 0.2.107, [e-mail])
 AC_PREREQ(2.62)
 
 AC_CONFIG_SRCDIR(src/main.c)
@@ -56,7 +56,12 @@
 #
 # glib
 #
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
+
+#
+# gdbus-codegen
+#
+AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen], AC_MSG_ERROR([gdbus-codegen is required but was not found]))
 
 #
 # dbus
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-07-09 08:05:06 +0000
+++ src/Makefile.am	2012-01-19 19:16:25 +0000
@@ -5,10 +5,10 @@
 
 include $(top_srcdir)/Makefile.am.marshal
 
-INCLUDE = 		\
-	-I.		\
-	-I$(srcdir)	\
-	$(NULL)
+INCLUDE = \
+		-I.		\
+		-I$(srcdir)	\
+		$(NULL)
 
 bamfdaemondir = $(libexecdir)
 
@@ -16,39 +16,36 @@
 		bamfdaemon \
 		$(NULL)
 
-bamfdaemon_glue_files = \
-                bamf-application-glue.h \
-		bamf-control-glue.h \
-		bamf-matcher-glue.h \
-		bamf-window-glue.h \
-		bamf-view-glue.h \
-		bamf-tab-glue.h \
-		bamf-indicator-source-glue.h \
-		bamf-indicator-glue.h \
+bamfdaemon_gdbus_files = \
+		bamf-gdbus-generated.c \
+		bamf-gdbus-generated.h \
+		bamf-gdbus-view-generated.c \
+		bamf-gdbus-view-generated.h \
+		bamf-gdbus-browser-generated.c \
+		bamf-gdbus-browser-generated.h \
+		bamf-gdbus-indicator-source-generated.c \
+		bamf-gdbus-indicator-source-generated.h \
 		$(NULL)
-		
-bamfdaemon_xml_glue_files = \
-                bamf-application-glue.xml \
-		bamf-control-glue.xml \
-		bamf-matcher-glue.xml \
-		bamf-window-glue.xml \
-		bamf-view-glue.xml \
-		bamf-tab-glue.xml \
-		bamf-indicator-source-glue.xml \
-		bamf-indicator-glue.xml \
+
+bamfdaemon_xml_gdbus_files = \
+		org.ayatana.bamf.xml \
+		org.ayatana.bamf.view.xml \
+		org.ayatana.bamf.browser.xml \
+		com.canonical.StatusNotifierApprover.xml \
 		$(NULL)
 
 bamfdaemon_built_sources = \
 		bamf-marshal.c \
 		bamf-marshal.h \
-		$(bamfdaemon_glue_files) \
+		$(bamfdaemon_gdbus_files) \
 		$(NULL)
 
 bamfdaemon_sources = \
 		main.c \
+		bamf-daemon.c \
 		bamf-legacy-window.c \
 		bamf-legacy-window-test.c \
-     		bamf-legacy-screen.c \
+		bamf-legacy-screen.c \
 		bamf-view.c \
 		bamf-control.c \
 		bamf-matcher.c \
@@ -63,9 +60,10 @@
 bamfdaemon_headers = \
 		main.h \
 		bamf.h \
+		bamf-daemon.h \
 		bamf-legacy-window.h \
 		bamf-legacy-window-test.h \
-	        bamf-legacy-screen.h \
+		bamf-legacy-screen.h \
 		bamf-view.h \
 		bamf-control.h \
 		bamf-matcher.h \
@@ -78,27 +76,22 @@
 		$(NULL)
 
 bamfdaemon_SOURCES = \
-                $(bamfdaemon_built_sources) \
+		$(bamfdaemon_built_sources) \
 		$(bamfdaemon_sources) \
 		$(bamfdaemon_headers) \
 		$(NULL)
 
 nodist_EXTRA_bamfdaemon_SOURCES = \
-	$(bamfdaemon_glue_files) \
+	$(bamfdaemon_gdbus_files) \
 	$(NULL)
 
 glib_marshal_list = bamf-marshal.list
 glib_marshal_prefix = bamf_marshal
 
-DISTCLEANFILES += \
-        $(bamfdaemon_glue_files) \
-	$(NULL)
-
 bamfdaemon_LDADD = \
 		$(X_LIBS) \
 		$(GLIB_LIBS) \
 		$(GTK_LIBS) \
-		$(DBUS_LIBS) \
 		$(WNCK_LIBS) \
 		$(GTOP_LIBS) \
 		$(NULL)
@@ -109,7 +102,6 @@
 		-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
 		$(GLIB_CFLAGS) \
 		$(GTK_CFLAGS) \
-		$(DBUS_CFLAGS) \
 		$(WNCK_CFLAGS) \
 		$(GTOP_CFLAGS) \
 		$(NULL)
@@ -118,36 +110,47 @@
 		-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
 		$(NULL)
 
-bamf-application-glue.h: bamf-application-glue.xml Makefile
-		$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_application --mode=glib-server --output=$@ $<
-
-bamf-control-glue.h: bamf-control-glue.xml Makefile
-		$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_control --mode=glib-server --output=$@ $<
-
-bamf-matcher-glue.h: bamf-matcher-glue.xml Makefile
-		$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_matcher --mode=glib-server --output=$@ $<
-
-bamf-window-glue.h: bamf-window-glue.xml Makefile
-		$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_window --mode=glib-server --output=$@ $<
-
-bamf-view-glue.h: bamf-view-glue.xml Makefile
-		$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_view --mode=glib-server --output=$@ $<
-
-bamf-tab-glue.h: bamf-tab-glue.xml Makefile
-		$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_tab --mode=glib-server --output=$@ $<
-
-bamf-indicator-source-glue.h: bamf-indicator-source-glue.xml Makefile
-		$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_indicator_source --mode=glib-server --output=$@ $<
-
-bamf-indicator-glue.h: bamf-indicator-glue.xml Makefile
-		$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_indicator --mode=glib-server --output=$@ $<
+bamf-gdbus-generated.c bamf-gdbus-generated.h: org.ayatana.bamf.xml
+		$(AM_V_GEN) $(GDBUS_CODEGEN) \
+		--generate-c-code bamf-gdbus-generated \
+		--c-namespace BamfDBus \
+		--interface-prefix org.ayatana.bamf \
+		$<
+
+bamf-gdbus-view-generated.c bamf-gdbus-view-generated.h: org.ayatana.bamf.view.xml
+		$(AM_V_GEN) $(GDBUS_CODEGEN) \
+		--c-generate-object-manager \
+		--generate-c-code bamf-gdbus-view-generated \
+		--c-namespace BamfDBusItem \
+		--interface-prefix org.ayatana.bamf \
+		$<
+
+bamf-gdbus-browser-generated.c bamf-gdbus-browser-generated.h: org.ayatana.bamf.browser.xml
+		$(AM_V_GEN) $(GDBUS_CODEGEN) \
+		--generate-c-code bamf-gdbus-browser-generated \
+		--c-namespace BamfDBusBrowser \
+		--interface-prefix org.ayatana.bamf.browser \
+		$<
+
+bamf-gdbus-indicator-source-generated.c bamf-gdbus-indicator-source-generated.h: com.canonical.StatusNotifierApprover.xml
+		$(AM_V_GEN) $(GDBUS_CODEGEN) \
+		--generate-c-code bamf-gdbus-indicator-source-generated \
+		--c-namespace StatusNotifierApprover \
+		--interface-prefix com.canonical.StatusNotifierApprover \
+		$<
 
 BUILT_SOURCES += \
-        $(bamfdaemon_glue_files) \
-	$(NULL)
+		$(bamfdaemon_gdbus_files) \
+		$(NULL)
 
 EXTRA_DIST += \
-        $(bamfdaemon_xml_glue_files) \
-	$(NULL)
-
-
+		$(bamfdaemon_xml_gdbus_files) \
+		$(NULL)
+
+DISTCLEANFILES += \
+		$(bamfdaemon_built_sources) \
+		$(NULL)
+
+CLEANFILES += \
+		$(bamfdaemon_built_sources) \
+		$(NULL)
 
=== removed file 'src/bamf-application-glue.xml'
--- src/bamf-application-glue.xml	2010-09-10 16:41:41 +0000
+++ src/bamf-application-glue.xml	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/org/ayatana/bamf">
-	
-	<interface name="org.ayatana.bamf.application">
-
-		<signal name="WindowAdded">
-			<arg type="s" name="path" direction="out" />
-		</signal>
-
-                <signal name="WindowRemoved">
-			<arg type="s" name="path" direction="out" />
-		</signal>
-
-		<method name="ApplicationType">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_application_get_application_type" />
-			<arg type="s" name="type" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="DesktopFile">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_application_get_desktop_file" />
-			<arg type="s" name="desktop_file" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="Xids">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_application_get_xids" />
-			<arg type="au" name="xids" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="ShowStubs">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_application_get_show_stubs" />
-			<arg type="b" name="show_stubs" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-	</interface>
-
-</node>
 
=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2011-12-14 03:17:37 +0000
+++ src/bamf-application.c	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -14,12 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
-
 #include "bamf-application.h"
-#include "bamf-application-glue.h"
 #include "bamf-window.h"
 #include "bamf-matcher.h"
 #include "bamf-indicator.h"
@@ -28,22 +27,17 @@
 #include <string.h>
 #include <gio/gdesktopappinfo.h>
 
-G_DEFINE_TYPE (BamfApplication, bamf_application, BAMF_TYPE_VIEW);
 #define BAMF_APPLICATION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
 BAMF_TYPE_APPLICATION, BamfApplicationPrivate))
 
-enum
-{
-  WINDOW_ADDED,
-  WINDOW_REMOVED,
-
-  LAST_SIGNAL,
-};
-
-static guint application_signals[LAST_SIGNAL] = { 0 };
+static void bamf_application_dbus_application_iface_init (BamfDBusItemApplicationIface *iface);
+G_DEFINE_TYPE_WITH_CODE (BamfApplication, bamf_application, BAMF_TYPE_VIEW,
+                         G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_APPLICATION,
+                                                bamf_application_dbus_application_iface_init));
 
 struct _BamfApplicationPrivate
 {
+  BamfDBusItemApplication *dbus_iface;
   char * desktop_file;
   GList * desktop_file_list;
   char * app_type;
@@ -153,27 +147,32 @@
         /* This will error to return false, which is okay as it seems
            unlikely anyone will want to set this flag except to turn
            off the stub menus. */
-        self->priv->show_stubs = g_key_file_get_boolean(keyfile, G_KEY_FILE_DESKTOP_GROUP, STUB_KEY, NULL);
+        self->priv->show_stubs = g_key_file_get_boolean (keyfile,
+                                                         G_KEY_FILE_DESKTOP_GROUP,
+                                                         STUB_KEY, NULL);
       }
       
-      if (g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-GNOME-FullName", NULL))
-    	  {
-    	    /* Grab the better name if its available */
-    	    gchar *fullname = NULL;
-    	    error = NULL; 
-    	    fullname = g_key_file_get_locale_string (keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-GNOME-FullName", NULL, &error);
-    	    if (error != NULL)
-    	      {
-    	        g_error_free (error);
-    	        if (fullname)
-    	          g_free (fullname);
-    	      }
-    	    else
-    	      {
-    	        g_free (name);
-    	        name = fullname;
-    	      }
-    	  }
+      if (g_key_file_has_key (keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-GNOME-FullName", NULL))
+        {
+          /* Grab the better name if its available */
+          gchar *fullname = NULL;
+          error = NULL; 
+          fullname = g_key_file_get_locale_string (keyfile,
+                                                   G_KEY_FILE_DESKTOP_GROUP,
+                                                   "X-GNOME-FullName", NULL,
+                                                   &error);
+          if (error != NULL)
+            {
+              g_error_free (error);
+              if (fullname)
+                g_free (fullname);
+            }
+          else
+            {
+              g_free (name);
+              name = fullname;
+            }
+        }
 
       g_object_unref (desktop);
       g_key_file_free(keyfile);
@@ -274,17 +273,18 @@
     application->priv->wmclass = NULL;
 }
 
-GArray *
+GVariant *
 bamf_application_get_xids (BamfApplication *application)
 {
   GList *l;
-  GArray *xids;
+  GVariantBuilder b;
   BamfView *view;
   guint32 xid;
 
   g_return_val_if_fail (BAMF_IS_APPLICATION (application), NULL);
 
-  xids = g_array_new (FALSE, TRUE, sizeof (guint32));
+  g_variant_builder_init (&b, G_VARIANT_TYPE ("(au)"));
+  g_variant_builder_open (&b, G_VARIANT_TYPE ("au"));
 
   for (l = bamf_view_get_children (BAMF_VIEW (application)); l; l = l->next)
     {
@@ -294,11 +294,12 @@
         continue;
 
       xid = bamf_window_get_xid (BAMF_WINDOW (view));
-
-      g_array_append_val (xids, xid);
+      g_variant_builder_add (&b, "u", xid);
     }
 
-  return xids;
+  g_variant_builder_close (&b);
+
+  return g_variant_builder_end (&b);
 }
 
 gboolean
@@ -339,32 +340,32 @@
 bamf_application_manages_xid (BamfApplication *application,
                               guint32 xid)
 {
-  GArray *xids;
-  int i;
+  GList *l;
   gboolean result = FALSE;
 
   g_return_val_if_fail (BAMF_IS_APPLICATION (application), FALSE);
 
-  xids = bamf_application_get_xids (application);
-
-  for (i = 0; i < xids->len; i++)
+  for (l = bamf_view_get_children (BAMF_VIEW (application)); l; l = l->next)
     {
-      if (g_array_index (xids, guint32, i) == xid)
+      BamfView *view = l->data;
+
+      if (!BAMF_IS_WINDOW (view))
+        continue;
+
+      if (bamf_window_get_xid (BAMF_WINDOW (view)) == xid)
         {
           result = TRUE;
           break;
         }
     }
 
-  g_array_free (xids, TRUE);
-
   return result;
 }
 
-static char *
+static const char *
 bamf_application_get_view_type (BamfView *view)
 {
-  return g_strdup ("application");
+  return "application";
 }
 
 static char *
@@ -455,7 +456,7 @@
 static void
 view_exported (BamfView *view, BamfApplication *self)
 {
-  g_signal_emit (self, application_signals[WINDOW_ADDED], 0, bamf_view_get_path (view));
+  g_signal_emit_by_name (self, "window-added", bamf_view_get_path (view));
 }
 
 static void
@@ -468,7 +469,7 @@
   if (BAMF_IS_WINDOW (child))
     {
       if (bamf_view_is_on_bus (child))
-        g_signal_emit (BAMF_APPLICATION (view), application_signals[WINDOW_ADDED], 0, bamf_view_get_path (child));
+        g_signal_emit_by_name (BAMF_APPLICATION (view), "window-added", bamf_view_get_path (child));
       else
         g_signal_connect (G_OBJECT (child), "exported",
                           (GCallback) view_exported, view);
@@ -486,15 +487,6 @@
   bamf_application_setup_icon_and_name (application);
 }
 
-static gboolean
-on_empty (GObject *object)
-{
-  g_return_val_if_fail (BAMF_IS_VIEW (object), FALSE);
-
-  bamf_view_close (BAMF_VIEW (object));
-  return FALSE;
-}
-
 static char *
 bamf_application_favorite_from_list (BamfApplication *self, GList *list)
 {
@@ -518,7 +510,7 @@
             }
         }
     }
-    
+
   return result;
 }
 
@@ -560,7 +552,8 @@
   if (BAMF_IS_WINDOW (child))
     {
       if (bamf_view_is_on_bus (child))
-        g_signal_emit (BAMF_APPLICATION (view), application_signals[WINDOW_REMOVED],0, bamf_view_get_path (child));
+        g_signal_emit_by_name (BAMF_APPLICATION (view), "window-removed",
+                               bamf_view_get_path (child));
     }
 
   g_signal_handlers_disconnect_by_func (G_OBJECT (child), view_active_changed, view);
@@ -569,9 +562,9 @@
 
   bamf_application_ensure_flags (BAMF_APPLICATION (view));
 
-  if (g_list_length (bamf_view_get_children (view)) == 0)
+  if (bamf_view_get_children (view) == NULL)
     {
-      g_idle_add ((GSourceFunc) on_empty, view);
+      bamf_view_close (view);
     }
 }
 
@@ -584,7 +577,7 @@
   g_return_if_fail (BAMF_IS_MATCHER (matcher));
   
   new_desktop_file = bamf_application_favorite_from_list (self, self->priv->desktop_file_list);
-  
+
   if (new_desktop_file)
     {
       bamf_application_set_desktop_file (self, new_desktop_file);
@@ -592,6 +585,67 @@
 }
 
 static void
+on_window_added (BamfApplication *self, const gchar *win_path, gpointer _not_used)
+{
+  g_return_if_fail (BAMF_IS_APPLICATION (self));
+  g_signal_emit_by_name (self->priv->dbus_iface, "window-added", win_path);
+}
+
+static void
+on_window_removed (BamfApplication *self, const gchar *win_path, gpointer _not_used)
+{
+  g_return_if_fail (BAMF_IS_APPLICATION (self));
+  g_signal_emit_by_name (self->priv->dbus_iface, "window-removed", win_path);
+}
+
+static gboolean
+on_dbus_handle_show_stubs (BamfDBusItemApplication *interface,
+                           GDBusMethodInvocation *invocation,
+                           BamfApplication *self)
+{
+  gboolean show_stubs = bamf_application_get_show_stubs (self);
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(b)", show_stubs));
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_xids (BamfDBusItemApplication *interface,
+                     GDBusMethodInvocation *invocation,
+                     BamfApplication *self)
+{
+  GVariant *xids = bamf_application_get_xids (self);
+  g_dbus_method_invocation_return_value (invocation, xids);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_desktop_file (BamfDBusItemApplication *interface,
+                             GDBusMethodInvocation *invocation,
+                             BamfApplication *self)
+{
+  const char *desktop_file = self->priv->desktop_file ? self->priv->desktop_file : "";
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(s)", desktop_file));
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_application_type (BamfDBusItemApplication *interface,
+                                 GDBusMethodInvocation *invocation,
+                                 BamfApplication *self)
+{
+  const char *type = self->priv->app_type ? self->priv->app_type : "";
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(s)", type));
+
+  return TRUE;
+}
+
+static void
 bamf_application_dispose (GObject *object)
 {
   BamfApplication *app;
@@ -629,13 +683,25 @@
       g_free (priv->wmclass);
       priv->wmclass = NULL;
     }
-  
-  g_signal_handlers_disconnect_by_func (G_OBJECT (bamf_matcher_get_default ()), matcher_favorites_changed, object);
+
+  g_signal_handlers_disconnect_by_func (G_OBJECT (bamf_matcher_get_default ()),
+                                        matcher_favorites_changed, object);
 
   G_OBJECT_CLASS (bamf_application_parent_class)->dispose (object);
 }
 
 static void
+bamf_application_finalize (GObject *object)
+{
+  BamfApplication *self;
+  self = BAMF_APPLICATION (object);
+
+  g_object_unref (self->priv->dbus_iface);
+
+  G_OBJECT_CLASS (bamf_application_parent_class)->finalize (object);
+}
+
+static void
 bamf_application_init (BamfApplication * self)
 {
   BamfApplicationPrivate *priv;
@@ -645,18 +711,49 @@
   priv->app_type = g_strdup ("system");
   priv->show_stubs = TRUE;
   priv->wmclass = NULL;
-  
+
+  /* Initializing the dbus interface */
+  priv->dbus_iface = bamf_dbus_item_application_skeleton_new ();
+
+  /* We need to connect to the object own signals to redirect them to the dbus
+   * interface                                                                */
+  g_signal_connect (self, "window-added", G_CALLBACK (on_window_added), NULL);
+  g_signal_connect (self, "window-removed", G_CALLBACK (on_window_removed), NULL);
+
+  /* Registering signal callbacks to reply to dbus method calls */
+  g_signal_connect (priv->dbus_iface, "handle-show-stubs",
+                    G_CALLBACK (on_dbus_handle_show_stubs), self);
+
+  g_signal_connect (priv->dbus_iface, "handle-xids",
+                    G_CALLBACK (on_dbus_handle_xids), self);
+
+  g_signal_connect (priv->dbus_iface, "handle-desktop-file",
+                    G_CALLBACK (on_dbus_handle_desktop_file), self);
+
+  g_signal_connect (priv->dbus_iface, "handle-application-type",
+                    G_CALLBACK (on_dbus_handle_application_type), self);
+
+  /* Setting the interface for the dbus object */
+  bamf_dbus_item_object_skeleton_set_application (BAMF_DBUS_ITEM_OBJECT_SKELETON (self),
+                                                  priv->dbus_iface);
+
   g_signal_connect (G_OBJECT (bamf_matcher_get_default ()), "favorites-changed", 
                     (GCallback) matcher_favorites_changed, self);
 }
 
 static void
+bamf_application_dbus_application_iface_init (BamfDBusItemApplicationIface *iface)
+{
+}
+
+static void
 bamf_application_class_init (BamfApplicationClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   BamfViewClass *view_class = BAMF_VIEW_CLASS (klass);
 
   object_class->dispose = bamf_application_dispose;
+  object_class->finalize = bamf_application_finalize;
 
   view_class->view_type = bamf_application_get_view_type;
   view_class->child_added = bamf_application_child_added;
@@ -665,27 +762,6 @@
   view_class->stable_bus_name = bamf_application_get_stable_bus_name;
 
   g_type_class_add_private (klass, sizeof (BamfApplicationPrivate));
-
-  dbus_g_object_type_install_info (BAMF_TYPE_APPLICATION,
-                   &dbus_glib_bamf_application_object_info);
-
-  application_signals [WINDOW_ADDED] =
-      g_signal_new ("window-added",
-                    G_OBJECT_CLASS_TYPE (klass),
-                    0,
-                    0, NULL, NULL,
-                    g_cclosure_marshal_VOID__STRING,
-                    G_TYPE_NONE, 1,
-                    G_TYPE_STRING);
-
-  application_signals [WINDOW_REMOVED] =
-      g_signal_new ("window-removed",
-                    G_OBJECT_CLASS_TYPE (klass),
-                    0,
-                    0, NULL, NULL,
-                    g_cclosure_marshal_VOID__STRING,
-                    G_TYPE_NONE, 1,
-                    G_TYPE_STRING);
 }
 
 BamfApplication *
 
=== modified file 'src/bamf-application.h'
--- src/bamf-application.h	2011-06-21 23:45:49 +0000
+++ src/bamf-application.h	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
@@ -50,33 +51,31 @@
   BamfApplicationPrivate *priv;
 };
 
-GType             bamf_application_get_type              (void) G_GNUC_CONST;
-
-char            * bamf_application_get_application_type  (BamfApplication *application);
-
-char            * bamf_application_get_desktop_file      (BamfApplication *application);
-void              bamf_application_set_desktop_file      (BamfApplication *application,
-                                                          const char * desktop_file);
-
-GArray          * bamf_application_get_xids              (BamfApplication *application);
-
-gboolean          bamf_application_manages_xid           (BamfApplication *application,
-                                                          guint32 xid);
+GType             bamf_application_get_type                   (void) G_GNUC_CONST;
+
+char            * bamf_application_get_desktop_file           (BamfApplication *application);
+void              bamf_application_set_desktop_file           (BamfApplication *application,
+                                                               const char * desktop_file);
+
+GVariant        * bamf_application_get_xids                   (BamfApplication *application);
+
+gboolean          bamf_application_manages_xid                (BamfApplication *application,
+                                                               guint32 xid);
 
 gboolean          bamf_application_contains_similar_to_window (BamfApplication *app, 
                                                                BamfWindow *window);
 
-char            * bamf_application_get_wmclass             (BamfApplication *application);
-void              bamf_application_set_wmclass             (BamfApplication *application,
-                                                            const char *wmclass);
-
-BamfApplication * bamf_application_new                   (void);
-
-BamfApplication * bamf_application_new_from_desktop_file (const char * desktop_file);
-gboolean          bamf_application_get_show_stubs        (BamfApplication *application);
-
-BamfApplication * bamf_application_new_from_desktop_files (GList * desktop_files);
-
-BamfApplication * bamf_application_new_with_wmclass (const char *wmclass);
+char            * bamf_application_get_wmclass                (BamfApplication *application);
+void              bamf_application_set_wmclass                (BamfApplication *application,
+                                                               const char *wmclass);
+
+BamfApplication * bamf_application_new                        (void);
+
+BamfApplication * bamf_application_new_from_desktop_file      (const char * desktop_file);
+gboolean          bamf_application_get_show_stubs             (BamfApplication *application);
+
+BamfApplication * bamf_application_new_from_desktop_files     (GList * desktop_files);
+
+BamfApplication * bamf_application_new_with_wmclass           (const char *wmclass);
 
 #endif
 
=== removed file 'src/bamf-control-glue.xml'
--- src/bamf-control-glue.xml	2010-08-18 23:22:58 +0000
+++ src/bamf-control-glue.xml	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/org/ayatana/bamf">
-
-	<interface name="org.ayatana.bamf.control">
-
-		<method name="RegisterApplicationForPid">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_control_register_application_for_pid" />
-			<arg type="s" name="application" direction="in" />
-			<arg type="i" name="pid" direction="in" />
-		</method>
-
-		<method name="RegisterTabProvider">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_control_register_tab_provider" />
-			<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
-			<arg type="s" name="tab_path" direction="in" />
-		</method>
-		
-		<method name="OmNomNomDesktopFile">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_control_insert_desktop_file" />
-			<arg type="s" name="tab_path" direction="in" />
-		</method>
-		
-		<method name="SetApproverBehavior">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_control_set_approver_behavior" />
-			<arg type="i" name="behavior" direction="in" />
-		</method>
-
-		<method name="Quit">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_control_quit" />
-		</method>
-		
-	</interface>
-
-</node>
 
=== modified file 'src/bamf-control.c'
--- src/bamf-control.c	2011-08-01 23:25:01 +0000
+++ src/bamf-control.c	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
@@ -21,11 +22,10 @@
 #include "bamf-tab-source.h"
 #include "bamf-matcher.h"
 #include "bamf-control.h"
-#include "bamf-control-glue.h"
 #include "bamf-indicator-source.h"
-#include <gtk/gtk.h>
+#include "bamf-daemon.h"
 
-G_DEFINE_TYPE (BamfControl, bamf_control, G_TYPE_OBJECT);
+G_DEFINE_TYPE (BamfControl, bamf_control, BAMF_DBUS_TYPE_CONTROL_SKELETON);
 #define BAMF_CONTROL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
 BAMF_TYPE_CONTROL, BamfControlPrivate))
 
@@ -56,26 +56,12 @@
 static void
 bamf_control_constructed (GObject *object)
 {
-  BamfControl *control;
-  DBusGConnection *bus;
-  GError *error = NULL;
+  GDBusConnection *gbus;
 
   if (G_OBJECT_CLASS (bamf_control_parent_class)->constructed)
     G_OBJECT_CLASS (bamf_control_parent_class)->constructed (object);
 
-  control = BAMF_CONTROL (object);
-
-  bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-
-  g_return_if_fail (bus);
-
-  dbus_g_connection_register_g_object (bus, BAMF_CONTROL_PATH,
-                                       G_OBJECT (control));
-
-  
-  GDBusConnection *gbus;
   gbus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-
   g_dbus_connection_signal_subscribe  (gbus,
                                        NULL,
                                        "org.gtk.gio.DesktopAppInfo",
@@ -84,14 +70,100 @@
                                        NULL,
                                        0,
                                        bamf_control_on_launched_callback,
-                                       control,
+                                       BAMF_CONTROL (object),
                                        NULL);
 }
 
+static gboolean
+on_dbus_handle_quit (BamfDBusControl *interface,
+                     GDBusMethodInvocation *invocation,
+                     BamfControl *self)
+{
+  bamf_control_quit (self);
+  g_dbus_method_invocation_return_value (invocation, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_set_approver_behavior (BamfDBusControl *interface,
+                                      GDBusMethodInvocation *invocation,
+                                      gint behavior,
+                                      BamfControl *self)
+{
+  bamf_control_set_approver_behavior (self, behavior);
+  g_dbus_method_invocation_return_value (invocation, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_om_nom_nom_desktop_file (BamfDBusControl *interface,
+                                        GDBusMethodInvocation *invocation,
+                                        const gchar *desktop_file,
+                                        BamfControl *self)
+{
+  bamf_control_insert_desktop_file (self, desktop_file);
+  g_dbus_method_invocation_return_value (invocation, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_register_tab_provider (BamfDBusControl *interface,
+                                      GDBusMethodInvocation *invocation,
+                                      const gchar *tab_path,
+                                      BamfControl *self)
+{
+  const gchar *sender = g_dbus_method_invocation_get_sender (invocation);
+  bamf_control_register_tab_provider (self, sender, tab_path);
+  g_dbus_method_invocation_return_value (invocation, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_register_application_for_pid (BamfDBusControl *interface,
+                                             GDBusMethodInvocation *invocation,
+                                             const gchar *application,
+                                             guint pid,
+                                             BamfControl *self)
+{
+  bamf_control_register_application_for_pid (self, application, pid);
+  g_dbus_method_invocation_return_value (invocation, NULL);
+
+  return TRUE;
+}
+
 static void
 bamf_control_init (BamfControl * self)
 {
   self->priv = BAMF_CONTROL_GET_PRIVATE (self);
+  self->priv->sources = NULL;
+
+  /* Registering signal callbacks to reply to dbus method calls */
+  g_signal_connect (self, "handle-quit",
+                    G_CALLBACK (on_dbus_handle_quit), self);
+
+  g_signal_connect (self, "handle-set-approver-behavior",
+                    G_CALLBACK (on_dbus_handle_set_approver_behavior), self);
+
+  g_signal_connect (self, "handle-om-nom-nom-desktop-file",
+                    G_CALLBACK (on_dbus_handle_om_nom_nom_desktop_file), self);
+
+  g_signal_connect (self, "handle-register-tab-provider",
+                    G_CALLBACK (on_dbus_handle_register_tab_provider), self);
+
+  g_signal_connect (self, "handle-register-application-for-pid",
+                    G_CALLBACK (on_dbus_handle_register_application_for_pid), self);
+}
+
+static void
+bamf_control_finalize (GObject *object)
+{
+  BamfControl *self = BAMF_CONTROL (object);
+  g_list_free_full (self->priv->sources, g_object_unref);
+  self->priv->sources = NULL;
 }
 
 static void
@@ -100,94 +172,68 @@
   GObjectClass *obj_class = G_OBJECT_CLASS (klass);
 
   obj_class->constructed = bamf_control_constructed;
-
-  dbus_g_object_type_install_info (BAMF_TYPE_CONTROL,
-				   &dbus_glib_bamf_control_object_info);
+  obj_class->finalize = bamf_control_finalize;
 
   g_type_class_add_private (klass, sizeof (BamfControlPrivate));
 }
 
-gboolean
+void
 bamf_control_set_approver_behavior (BamfControl *control,
-                                    gint32 behavior,
-                                    GError **error)
+                                    gint32 behavior)
 {
-  bamf_indicator_source_set_behavior (bamf_indicator_source_get_default (), behavior);
-  
-  return TRUE;
+  BamfIndicatorSource *indicator_source = bamf_indicator_source_get_default ();
+  bamf_indicator_source_set_behavior (indicator_source, behavior);
 }
 
-gboolean
+void
 bamf_control_register_application_for_pid (BamfControl *control,
-                                           char *application,
-                                           gint32 pid,
-                                           GError **error)
+                                           const char *application,
+                                           gint32 pid)
 {
-  bamf_matcher_register_desktop_file_for_pid (bamf_matcher_get_default (),
-                                              application, pid);
-
-  return TRUE;
+  BamfMatcher *matcher = bamf_matcher_get_default ();
+  bamf_matcher_register_desktop_file_for_pid (matcher, application, pid);
 }
 
-gboolean
+void
 bamf_control_insert_desktop_file (BamfControl *control,
-                                  char *path,
-                                  GError **error)
+                                  const char *path)
 {
-  bamf_matcher_load_desktop_file (bamf_matcher_get_default (), path);
-
-  return TRUE;
+  BamfMatcher *matcher = bamf_matcher_get_default ();
+  bamf_matcher_load_desktop_file (matcher, path);
 }
 
-gboolean
+void
 bamf_control_register_tab_provider (BamfControl *control,
-                                    char *path,
-                                    DBusGMethodInvocation *context)
+                                    const char *sender,
+                                    const char *path)
 {
   BamfTabSource *source;
-  char *bus;
-
-  if (!path)
-    {
-      dbus_g_method_return (context);
-      return TRUE;
-    }
-
-  bus = dbus_g_method_get_sender (context);
-
-  if (!bus)
-    {
-      dbus_g_method_return (context);
-      return TRUE;
-    }
-
-  source = bamf_tab_source_new (bus, path);
-
-  if (!BAMF_IS_TAB_SOURCE (source))
-    {
-      dbus_g_method_return (context);
-      return TRUE;
-    }
-
-  control->priv->sources = g_list_prepend (control->priv->sources, source);
-
-  dbus_g_method_return (context);
-  return TRUE;
+
+  if (!path || !sender)
+    {
+      return;
+    }
+
+  source = bamf_tab_source_new (g_strdup (sender), g_strdup (path));
+
+  if (BAMF_IS_TAB_SOURCE (source))
+    {
+      control->priv->sources = g_list_prepend (control->priv->sources, source);
+    }
 }
 
 static gboolean
 bamf_control_on_quit (BamfControl *control)
 {
-  gtk_main_quit ();
+  BamfDaemon *daemon = bamf_daemon_get_default ();
+  bamf_daemon_stop (daemon);
   return FALSE;
 }
 
-gboolean
-bamf_control_quit (BamfControl *control,
-                   GError **error)
+void
+bamf_control_quit (BamfControl *control)
 {
   g_idle_add ((GSourceFunc) bamf_control_on_quit, control);
-  return TRUE;
 }
 
 BamfControl *
@@ -198,8 +244,7 @@
   if (!BAMF_IS_CONTROL (control))
     {
       control = (BamfControl *) g_object_new (BAMF_TYPE_CONTROL, NULL);
-      return control;
     }
 
-  return g_object_ref (G_OBJECT (control));
+  return control;
 }
 
=== modified file 'src/bamf-control.h'
--- src/bamf-control.h	2010-08-18 23:22:58 +0000
+++ src/bamf-control.h	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
@@ -24,8 +25,7 @@
 #include "bamf.h"
 #include <glib.h>
 #include <glib-object.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <gio/gio.h>
 
 #define BAMF_TYPE_CONTROL			(bamf_control_get_type ())
 #define BAMF_CONTROL(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), BAMF_TYPE_CONTROL, BamfControl))
@@ -40,12 +40,12 @@
 
 struct _BamfControlClass
 {
-  GObjectClass parent;
+  BamfDBusControlSkeletonClass parent;
 };
 
 struct _BamfControl
 {
-  GObject parent;
+  BamfDBusControlSkeleton parent;
 
   /* private */
   BamfControlPrivate *priv;
@@ -53,25 +53,21 @@
 
 GType         bamf_control_get_type                     (void) G_GNUC_CONST;
 
-gboolean      bamf_control_register_application_for_pid (BamfControl *control,
-                                                         char *application,
-                                                         gint32 pid,
-                                                         GError **error);
-
-gboolean      bamf_control_register_tab_provider        (BamfControl *control,
-                                                         char *path,
-                                                         DBusGMethodInvocation *context);
-
-gboolean      bamf_control_insert_desktop_file          (BamfControl *control,
-                                                         char *path,
-                                                         GError **error);
-
-gboolean      bamf_control_set_approver_behavior        (BamfControl *control,
-                                                         gint32 behavior,
-                                                         GError **error);
-
-gboolean      bamf_control_quit                         (BamfControl *control,
-                                                         GError **error);
+void          bamf_control_register_application_for_pid (BamfControl *control,
+                                                         const char *application,
+                                                         gint32 pid);
+
+void          bamf_control_register_tab_provider        (BamfControl *control,
+                                                         const char *sender,
+                                                         const char *path);
+
+void          bamf_control_insert_desktop_file          (BamfControl *control,
+                                                         const char *path);
+
+void          bamf_control_set_approver_behavior        (BamfControl *control,
+                                                         gint32 behavior);
+
+void          bamf_control_quit                         (BamfControl *control);
 
 BamfControl * bamf_control_get_default                  (void);
 
 
=== added file 'src/bamf-daemon.c'
--- src/bamf-daemon.c	1970-01-01 00:00:00 +0000
+++ src/bamf-daemon.c	2012-01-19 19:16:25 +0000
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2011 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 "bamf.h"
+
+#include "bamf-daemon.h"
+#include "bamf-matcher.h"
+#include "bamf-control.h"
+#include "bamf-indicator-source.h"
+
+G_DEFINE_TYPE (BamfDaemon, bamf_daemon, G_TYPE_OBJECT);
+#define BAMF_DAEMON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+                                      BAMF_TYPE_DAEMON, BamfDaemonPrivate))
+
+static BamfDaemon *instance = NULL;
+
+struct _BamfDaemonPrivate
+{
+  BamfMatcher *matcher;
+  BamfControl *control;
+  BamfIndicatorSource *approver;
+  GMainLoop *loop;
+};
+
+gboolean
+bamf_daemon_is_running (BamfDaemon *self)
+{
+  g_return_val_if_fail (self, FALSE);
+
+  if (self->priv->loop && g_main_loop_is_running (self->priv->loop))
+    {
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+bamf_on_bus_acquired (GDBusConnection *connection, const gchar *name,
+                      BamfDaemon *self)
+{
+  GError *error = NULL;
+  g_return_if_fail (BAMF_IS_DAEMON (self));
+
+  g_debug ("Acquired a message bus connection");
+
+  g_dbus_connection_set_exit_on_close (connection, TRUE);
+
+  self->priv->matcher = bamf_matcher_get_default ();
+  self->priv->control = bamf_control_get_default ();
+  //self->priv->approver = bamf_indicator_source_get_default ();
+
+  g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->priv->matcher),
+                                    connection,
+                                    BAMF_MATCHER_PATH,
+                                    &error);
+
+  if (error)
+    {
+      g_critical ("Can't register BAMF matcher at path %s: %s", BAMF_MATCHER_PATH,
+                                                                error->message);
+      g_clear_error (&error);
+    }
+
+  g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->priv->control),
+                                    connection,
+                                    BAMF_CONTROL_PATH,
+                                    &error);
+
+  if (error)
+    {
+      g_critical ("Can't register BAMF control at path %s: %s", BAMF_CONTROL_PATH,
+                                                                error->message);
+      g_clear_error (&error);
+    }
+/*
+  g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->priv->approver),
+                                    connection,
+                                    BAMF_INDICATOR_SOURCE_PATH,
+                                    &error);
+
+  if (error)
+    {
+      g_critical ("Can't register BAMF approver at path %s: %s",
+                                     BAMF_INDICATOR_SOURCE_PATH, error->message);
+      g_clear_error (&error);
+    }
+*/
+}
+
+static void
+bamf_on_name_acquired (GDBusConnection *connection, const gchar *name,
+                       BamfDaemon *self)
+{
+  g_debug ("Acquired the name %s", name);
+}
+
+static void
+bamf_on_name_lost (GDBusConnection *connection, const gchar *name, BamfDaemon *self)
+{
+  g_critical ("Lost the name %s, another BAMF daemon is currently running", name);
+
+  bamf_daemon_stop (self);
+}
+
+void
+bamf_daemon_start (BamfDaemon *self)
+{
+  g_return_if_fail (BAMF_IS_DAEMON (self));
+
+  if (bamf_daemon_is_running (self))
+    return;
+
+  g_bus_own_name (G_BUS_TYPE_SESSION, BAMF_DBUS_SERVICE,
+                  G_BUS_NAME_OWNER_FLAGS_NONE,
+                  (GBusAcquiredCallback) bamf_on_bus_acquired,
+                  (GBusNameAcquiredCallback) bamf_on_name_acquired,
+                  (GBusNameLostCallback) bamf_on_name_lost,
+                  self, NULL);
+
+  g_main_loop_run (self->priv->loop);
+}
+
+void
+bamf_daemon_stop (BamfDaemon *self)
+{
+  g_return_if_fail (BAMF_IS_DAEMON (self));
+
+  if (self->priv->matcher)
+    {
+      g_object_unref (self->priv->matcher);
+      self->priv->matcher = NULL;
+    }
+
+  if (self->priv->control)
+    {
+      g_object_unref (self->priv->control);
+      self->priv->control = NULL;
+    }
+
+  if (self->priv->approver)
+    {
+      g_object_unref (self->priv->approver);
+      self->priv->approver = NULL;
+    }
+
+  g_main_loop_quit (self->priv->loop);
+}
+
+static void
+bamf_daemon_dispose (GObject *object)
+{
+  BamfDaemon *self = BAMF_DAEMON (object);
+
+  bamf_daemon_stop (self);
+
+  if (self->priv->loop)
+    {
+      g_main_loop_unref (self->priv->loop);
+      self->priv->loop = NULL;
+    }
+
+  G_OBJECT_CLASS (bamf_daemon_parent_class)->dispose (object);
+}
+
+static void
+bamf_daemon_finalize (GObject *object)
+{
+  instance = NULL;
+}
+
+static void
+bamf_daemon_init (BamfDaemon *self)
+{
+  BamfDaemonPrivate *priv;
+  priv = self->priv = BAMF_DAEMON_GET_PRIVATE (self);
+
+  priv->loop = g_main_loop_new (NULL, FALSE);
+}
+
+static void
+bamf_daemon_class_init (BamfDaemonClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose  = bamf_daemon_dispose;
+  object_class->finalize = bamf_daemon_finalize;
+
+  g_type_class_add_private (klass, sizeof (BamfDaemonPrivate));
+}
+
+BamfDaemon *
+bamf_daemon_get_default (void)
+{
+  if (!BAMF_IS_DAEMON (instance))
+    instance = (BamfDaemon *) g_object_new (BAMF_TYPE_DAEMON, NULL);
+
+  return instance;
+}
 
=== added file 'src/bamf-daemon.h'
--- src/bamf-daemon.h	1970-01-01 00:00:00 +0000
+++ src/bamf-daemon.h	2012-01-19 19:16:25 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 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]>
+ *
+ */
+
+#ifndef __BAMFDAEMON_H__
+#define __BAMFDAEMON_H__
+
+#include "bamf.h"
+#include <glib.h>
+#include <glib-object.h>
+
+#define BAMF_TYPE_DAEMON			(bamf_daemon_get_type ())
+#define BAMF_DAEMON(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), BAMF_TYPE_DAEMON, BamfDaemon))
+#define BAMF_IS_DAEMON(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), BAMF_TYPE_DAEMON))
+#define BAMF_DAEMON_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), BAMF_TYPE_DAEMON, BamfDaemonClass))
+#define BAMF_IS_DAEMON_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), BAMF_TYPE_DAEMON))
+#define BAMF_DAEMON_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_DAEMON, BamfDaemonClass))
+
+typedef struct _BamfDaemon BamfDaemon;
+typedef struct _BamfDaemonClass BamfDaemonClass;
+typedef struct _BamfDaemonPrivate BamfDaemonPrivate;
+
+struct _BamfDaemonClass
+{
+  GObjectClass parent;
+};
+
+struct _BamfDaemon
+{
+  GObject parent;
+
+  /* private */
+  BamfDaemonPrivate *priv;
+};
+
+GType        bamf_daemon_get_type    (void) G_GNUC_CONST;
+
+void         bamf_daemon_start       (BamfDaemon *self);
+
+void         bamf_daemon_stop        (BamfDaemon *self);
+
+gboolean     bamf_daemon_is_running  (BamfDaemon *self);
+
+BamfDaemon * bamf_daemon_get_default (void);
+
+#endif //__BAMFDAEMON_H__
 
=== removed file 'src/bamf-indicator-glue.xml'
--- src/bamf-indicator-glue.xml	2010-07-09 08:05:06 +0000
+++ src/bamf-indicator-glue.xml	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/org/ayatana/bamf">
-
-	<interface name="org.ayatana.bamf.indicator">
-
-		<method name="Path">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_indicator_get_path" />
-			<arg type="s" name="path" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="Address">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_indicator_get_address" />
-			<arg type="s" name="address" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-	</interface>
-	
-</node>
 
=== removed file 'src/bamf-indicator-source-glue.xml'
--- src/bamf-indicator-source-glue.xml	2011-01-14 06:35:14 +0000
+++ src/bamf-indicator-source-glue.xml	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node name="/org/ayatana/bamf">
-	<interface name="com.canonical.StatusNotifierApprover">
-		<signal name="ReviseJudgement">
-			<arg type="b" name="approved" direction="out" />
-			<arg type="s" name="address" direction="out" />
-			<arg type="o" name="path" direction="out" />
-		</signal>
-	
-		<!-- Methods -->
-		<method name="ApproveItem">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_indicator_source_approve_item" />
-			<!-- KSNI ID -->
-			<arg type="s" name="id" direction="in" />
-			<!-- KSNI Category -->
-			<arg type="s" name="category" direction="in" />
-			<!-- Application PID -->
-			<arg type="u" name="pid" direction="in" />
-			<!-- Application DBus Address -->
-			<arg type="s" name="address" direction="in" />
-			<!-- Application DBus Path for KSNI interface -->
-			<arg type="o" name="path" direction="in" />
-			<!-- So, what do you think? -->
-			<arg type="b" name="approved" direction="out" />
-		</method>
-
-	</interface>
-</node>
 
=== modified file 'src/bamf-indicator-source.c'
--- src/bamf-indicator-source.c	2011-02-09 18:45:53 +0000
+++ src/bamf-indicator-source.c	2012-01-19 19:16:25 +0000
@@ -1,39 +1,32 @@
 /*
- * bamf-notification-approver.c
- * This file is part of BAMF
- *
- * Copyright (C) 2010 - Jason Smith
- *
- * BAMF is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * BAMF is distributed in the hope that it will be useful,
+ * Copyright (C) 2010-2011 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 BAMF; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
+ *
  */
 
-
-#include "bamf-marshal.h"
 #include "bamf-indicator-source.h"
-#include "bamf-indicator-source-glue.h"
-#include <dbus/dbus-glib-bindings.h>
 
-#define BAMF_INDICATOR_SOURCE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), BAMF_TYPE_INDICATOR_SOURCE, BamfIndicatorSourcePrivate))
-#define BAMF_INDICATOR_SOURCE_PATH "/org/ayatana/bamf/IndicatorSource"
+#define BAMF_INDICATOR_SOURCE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), \
+                        BAMF_TYPE_INDICATOR_SOURCE, BamfIndicatorSourcePrivate))
 
 enum
 {
   INDICATOR_OPENED,
   INDICATOR_CLOSED,
-  REVISE_JUDGEMENT,
 
   LAST_SIGNAL,
 };
@@ -43,17 +36,17 @@
 struct _BamfIndicatorSourcePrivate
 {
   GList *indicators;
-  DBusGProxy *proxy;
+  GDBusProxy *proxy;
   int behavior;
 };
 
-G_DEFINE_TYPE (BamfIndicatorSource, bamf_indicator_source, G_TYPE_OBJECT)
+G_DEFINE_TYPE (BamfIndicatorSource, bamf_indicator_source, STATUS_NOTIFIER_APPROVER_TYPE__SKELETON)
 
 GList *
 bamf_indicator_source_get_indicators (BamfIndicatorSource *self)
 {
   g_return_val_if_fail (BAMF_IS_INDICATOR_SOURCE (self), NULL);
-  
+
   return self->priv->indicators;
 }
 
@@ -61,15 +54,15 @@
 on_indicator_closed (BamfView *view, BamfIndicatorSource *self)
 {
   BamfIndicator *indicator;
- 
+
   g_return_if_fail (BAMF_IS_INDICATOR (view));
   g_return_if_fail (BAMF_IS_INDICATOR_SOURCE (self));
-  
+
   indicator = BAMF_INDICATOR (view);
-  
+
   self->priv->indicators = g_list_remove (self->priv->indicators, indicator);
   g_signal_emit (self, indicator_source_signals[INDICATOR_CLOSED], 0, indicator);
-  
+
   g_object_unref (G_OBJECT (indicator));
 }
 
@@ -78,9 +71,10 @@
 {
   g_return_if_fail (BAMF_IS_INDICATOR (indicator));
   g_return_if_fail (BAMF_IS_INDICATOR_SOURCE (self));
-  
-  char *address = bamf_indicator_get_address (indicator);
-  char *path = bamf_indicator_get_path (indicator);
+
+  const char *address = bamf_indicator_get_address (indicator);
+  const char *path = bamf_indicator_get_path (indicator);
+  GList *parents = bamf_view_get_parents (BAMF_VIEW (indicator));
   gboolean approve = TRUE;
 
   switch (self->priv->behavior)
@@ -89,17 +83,14 @@
         approve = FALSE;
         break;
       case BAMF_INDICATOR_SOURCE_APPROVE_MATCHED:
-        approve = g_list_length (bamf_view_get_parents (BAMF_VIEW (indicator))) == 0;
+        approve = (parents == NULL);
         break;
       case BAMF_INDICATOR_SOURCE_APPROVE_ALL:
         approve = TRUE;
         break;
     }
-  
-  g_signal_emit (self, indicator_source_signals[REVISE_JUDGEMENT], 0, approve, address, path);
-  
-  g_free (address);
-  g_free (path); 
+
+  g_signal_emit_by_name (self, "revise-judgement", approve, address, path);
 }
 
 void 
@@ -114,9 +105,9 @@
   
   if (priv->behavior == behavior)
     return;
-  
+
   priv->behavior = behavior;
-  
+
   g_list_foreach (priv->indicators, (GFunc) rejudge_approval, self);
 }
 
@@ -126,61 +117,80 @@
                                     const char *category,
                                     guint32 pid,
                                     const char *address,
-                                    const char *path,
-                                    gboolean *approve,
-                                    GError **remote_error)
+                                    const char *path)
 {
-  DBusGConnection *bus;
-  DBusGProxy *dbus_proxy;
   GList *l;
   GError *error = NULL;
   BamfIndicator *indicator = NULL;
-  *approve = TRUE;
-  guint remote_pid;
-  
+
   g_return_val_if_fail (category, TRUE);
   g_return_val_if_fail (path, TRUE);
   g_return_val_if_fail (address, TRUE);
   g_return_val_if_fail (BAMF_IS_INDICATOR_SOURCE (self), TRUE);
-  
+
   if (g_strcmp0 (category, "ApplicationStatus") != 0 || 
       g_strcmp0 (path, "/com/canonical/NotificationItem/dropbox_client") == 0)
     return TRUE;
-    
+
   if (pid == 0)
     {
-      g_warning ("Remote service passed indicator with pid of 0, manually fetching pid\n");
-      
-      bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-      g_return_val_if_fail (bus, TRUE);
- 
-      dbus_proxy = dbus_g_proxy_new_for_name (bus,
-                                              DBUS_SERVICE_DBUS,
-                                              DBUS_PATH_DBUS,
-                                              DBUS_INTERFACE_DBUS);
-      g_return_val_if_fail (dbus_proxy, TRUE);
-   
-      error = NULL;
-      if (!org_freedesktop_DBus_get_connection_unix_process_id (dbus_proxy, address, &remote_pid, &error))
-        {
-          g_warning ("Could not get indicator process id: %s\n", error->message);
-          g_error_free (error);
-        }
-     
-      g_object_unref (G_OBJECT (dbus_proxy));
-      pid = (guint32) remote_pid;
+      GDBusProxy *gproxy;
+      GVariant *remote_pid;
+
+      g_warning ("Remote service passed indicator with pid of 0, manually fetching pid");
+
+      gproxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                              G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES|
+                                              G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+                                              NULL,
+                                              "org.freedesktop.DBus",
+                                              "/org/freedesktop/DBus",
+                                              "org.freedesktop.DBus",
+                                              NULL,
+                                              &error);
+
+      if (error)
+        {
+          g_warning ("Could not get indicator process id: %s", error->message);
+          g_clear_error (&error);
+        }
+
+      g_return_val_if_fail (G_IS_DBUS_PROXY (gproxy), TRUE);
+
+      remote_pid = g_dbus_proxy_call_sync (gproxy, "GetConnectionUnixProcessID",
+                                           g_variant_new ("(s)", address),
+                                           G_DBUS_CALL_FLAGS_NONE,
+                                           -1,
+                                           NULL,
+                                           &error);
+      if (error)
+        {
+          g_warning ("Could not get indicator process id: %s", error->message);
+          g_clear_error (&error);
+          return TRUE;
+        }
+
+      g_return_val_if_fail (remote_pid, TRUE);
+
+      pid = g_variant_get_uint32 (g_variant_get_child_value (remote_pid, 0));
+
+      g_object_unref (gproxy);
+      g_variant_unref (remote_pid);
+
+      if (pid == 0)
+        return TRUE;
     }
-  
+
   for (l = self->priv->indicators; l; l = l->next)
     {
       if (bamf_indicator_matches_signature (BAMF_INDICATOR (l->data), pid, address, path))
         {
-          g_debug ("NotifierWatcher service passed already known indicator, ignoring\n");
+          g_debug ("NotifierWatcher service passed already known indicator, ignoring");
           indicator = BAMF_INDICATOR (l->data);
           break;
         }
     }
-  
+
   if (!indicator)
     {
       indicator = bamf_indicator_new (id, path, address,  pid);
@@ -189,101 +199,145 @@
       g_signal_connect (G_OBJECT (indicator), "closed", (GCallback) on_indicator_closed, self);
       g_signal_emit (self, indicator_source_signals[INDICATOR_OPENED], 0, indicator);
     }
-  
+
+  GList *parents = bamf_view_get_parents (BAMF_VIEW (indicator));
+
   switch (self->priv->behavior)
     {
       case BAMF_INDICATOR_SOURCE_APPROVE_NONE:
-        *approve = FALSE;
-        break;
-        
+        return FALSE;
+
       case BAMF_INDICATOR_SOURCE_APPROVE_MATCHED:
-        *approve = !(indicator && g_list_length (bamf_view_get_parents (BAMF_VIEW (indicator))) > 0);
-        break;
-        
+        return !(indicator && parents);
+
       case BAMF_INDICATOR_SOURCE_APPROVE_ALL:
-        *approve = TRUE;
-        break;
+        return TRUE;
     }
-  
+
   return TRUE;
 }
 
-static void on_proxy_destroy (DBusGProxy *proxy, BamfIndicatorSource *self);
+static void status_notifier_proxy_owner_changed (GObject *object, GParamSpec *pspec, BamfIndicatorSource *self);
 
 static gboolean
 bamf_indicator_source_register_notification_approver (BamfIndicatorSource *self)
 {
-  DBusGConnection *bus;
-  GError *error = NULL;
   static int retry_count = 0;
-
-  bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-  g_return_val_if_fail (bus, FALSE);
-
-  self->priv->proxy = dbus_g_proxy_new_for_name_owner (bus,
-                                                       "com.canonical.indicator.application",
-                                                       "/StatusNotifierWatcher",
-                                                       "org.kde.StatusNotifierWatcher",
-                                                       &error);
-  
-  if (self->priv->proxy)
-    {
-      if (dbus_g_proxy_call (self->priv->proxy,
-                             "XAyatanaRegisterNotificationApprover",
-                             &error,
-                             DBUS_TYPE_G_OBJECT_PATH, BAMF_INDICATOR_SOURCE_PATH,
-                             G_TYPE_STRV, NULL,
-                             G_TYPE_INVALID,
-                             G_TYPE_INVALID))
+  GDBusProxy *gproxy;
+  GError *error = NULL;
+  gchar *owner;
+
+  gproxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES|
+                                          G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS|
+                                          G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                                          NULL,
+                                          "org.kde.StatusNotifierWatcher",//"com.canonical.indicator.application",
+                                          "/StatusNotifierWatcher",
+                                          "org.kde.StatusNotifierWatcher",
+                                          NULL,
+                                          &error);
+
+  if (error)
+    {
+       g_debug ("Failed to get notification approver proxy: %s", error->message);
+       g_error_free (error);
+    }
+  else
+    {
+      owner = g_dbus_proxy_get_name_owner (gproxy);
+
+      if (owner)
         {
-          g_debug ("Remote notification approver registered\n");
-          g_signal_connect (G_OBJECT (self->priv->proxy), "destroy", (GCallback) on_proxy_destroy, self);
-          retry_count = 0;
-          return FALSE;
+          g_free (owner);
+
+          GVariantBuilder tuple, array;
+          g_variant_builder_init (&tuple, G_VARIANT_TYPE_TUPLE);
+          g_variant_builder_add_value (&tuple, g_variant_new_object_path (BAMF_INDICATOR_SOURCE_PATH));
+          g_variant_builder_init (&array, G_VARIANT_TYPE ("as"));
+          g_variant_builder_add_value (&tuple, g_variant_builder_end (&array));
+
+          g_dbus_proxy_call_sync (gproxy, "XAyatanaRegisterNotificationApprover",
+                                           g_variant_builder_end (&tuple),
+                                           G_DBUS_CALL_FLAGS_NONE,
+                                           -1,
+                                           NULL,
+                                           &error);
+
+          if (!error)
+            {
+              g_debug ("Remote notification approver registered");
+              g_signal_connect (G_OBJECT (gproxy), "notify::g-name-owner",
+                                (GCallback) status_notifier_proxy_owner_changed,
+                                self);
+
+              if (self->priv->proxy)
+                g_object_unref (self->priv->proxy);
+
+              self->priv->proxy = gproxy;
+              retry_count = 0;
+              return FALSE;
+            }
+          else
+            {
+              g_debug ("Failed to register as approver: %s", error->message);
+              g_error_free (error);
+            }
         }
       else
         {
-          g_debug ("Failed to register as approver: %s\n", error->message);
-          g_error_free (error);
+           g_debug ("Failed to get notification approver proxy: no owner available");
         }
-    }
-  else
-    {
-      g_debug ("Failed to get notification approver proxy: %s\n", error->message);
-      g_error_free (error);
-    }
+
+      g_object_unref (gproxy);
+    }
+
   retry_count++;
-      
+
   if (retry_count > 10)
     {
-      g_debug ("Retry count expired\n");
+      g_debug ("Retry count expired");
       return FALSE;
     }
-  
-  g_debug ("Retrying registration in 2 seconds\n");
+
+  g_debug ("Retrying registration in 2 seconds");
   return TRUE;
 }
 
 static void
-on_proxy_destroy (DBusGProxy *proxy, BamfIndicatorSource *self)
+status_notifier_proxy_owner_changed (GObject *object, GParamSpec *pspec,
+                                     BamfIndicatorSource *self)
 {
-  g_return_if_fail (BAMF_IS_INDICATOR_SOURCE (self));
- 
-  g_debug ("Remote approver service died, re-establishing connection\n");
-  
+  g_debug ("Remote approver service died, re-establishing connection");
+  g_object_unref (self->priv->proxy);
+  self->priv->proxy = NULL;
+
   if (bamf_indicator_source_register_notification_approver (self))
-    g_timeout_add (2 * 1000, (GSourceFunc) bamf_indicator_source_register_notification_approver, self);
+    g_timeout_add_seconds (2, (GSourceFunc) bamf_indicator_source_register_notification_approver, self);
+}
+
+static gboolean
+on_dbus_handle_approve_item (BamfDBusMatcher *interface,
+                             GDBusMethodInvocation *invocation,
+                             const gchar *id,
+                             const gchar *category,
+                             guint pid,
+                             const gchar *address,
+                             const gchar *path,
+                             BamfIndicatorSource *self)
+{
+  gboolean approved = bamf_indicator_source_approve_item (self, id, category,
+                                                          pid, address, path);
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(b)", approved));
+
+  return TRUE;
 }
 
 static void
 bamf_indicator_source_constructed (GObject *object)
 {
   BamfIndicatorSource *self;
-  DBusGConnection *bus;
-  GError *error = NULL;
-
-  bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-  g_return_if_fail (bus);
 
   self = BAMF_INDICATOR_SOURCE (object);
 
@@ -292,15 +346,27 @@
 
   self->priv->behavior = BAMF_INDICATOR_SOURCE_APPROVE_ALL;
   
-  dbus_g_connection_register_g_object (bus, BAMF_INDICATOR_SOURCE_PATH, object);
-  
   if (bamf_indicator_source_register_notification_approver (self))
-    g_timeout_add (2 * 1000, (GSourceFunc) bamf_indicator_source_register_notification_approver, self);
+    g_timeout_add_seconds (2, (GSourceFunc) bamf_indicator_source_register_notification_approver, self);
 }
 
 static void
 bamf_indicator_source_dispose (GObject *object)
 {
+  BamfIndicatorSource *self = BAMF_INDICATOR_SOURCE (object);
+
+  if (self->priv->indicators)
+    {
+      g_list_free_full (self->priv->indicators, g_object_unref);
+      self->priv->indicators = NULL;
+    }
+
+  if (self->priv->proxy)
+    {
+      g_object_unref (self->priv->proxy);
+      self->priv->proxy = NULL;
+    }
+
   G_OBJECT_CLASS (bamf_indicator_source_parent_class)->dispose (object);
 }
 
@@ -308,50 +374,41 @@
 bamf_indicator_source_class_init (BamfIndicatorSourceClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	
+  
   object_class->dispose = bamf_indicator_source_dispose;
   object_class->constructed = bamf_indicator_source_constructed;
 
-  indicator_source_signals [REVISE_JUDGEMENT] =
-  	g_signal_new ("revise-judgement",
-  	              G_OBJECT_CLASS_TYPE (klass),
-  	              G_SIGNAL_RUN_FIRST,
-  	              G_STRUCT_OFFSET (BamfIndicatorSourceClass, revise_judgement),
-  	              NULL, NULL,
-  	              bamf_marshal_VOID__BOOL_STRING_STRING,
-  	              G_TYPE_NONE, 3,
-  	              G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING);
+  g_type_class_add_private (object_class, sizeof (BamfIndicatorSourcePrivate));
 
   indicator_source_signals [INDICATOR_OPENED] =
-  	g_signal_new ("indicator-opened",
-  	              G_OBJECT_CLASS_TYPE (klass),
-  	              G_SIGNAL_RUN_FIRST,
-  	              G_STRUCT_OFFSET (BamfIndicatorSourceClass, indicator_opened),
-  	              NULL, NULL,
-  	              g_cclosure_marshal_VOID__OBJECT,
-  	              G_TYPE_NONE, 1,
-  	              BAMF_TYPE_INDICATOR);
+    g_signal_new ("indicator-opened",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (BamfIndicatorSourceClass, indicator_opened),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  BAMF_TYPE_INDICATOR);
 
   indicator_source_signals [INDICATOR_CLOSED] =
-  	g_signal_new ("indicator-closed",
-  	              G_OBJECT_CLASS_TYPE (klass),
-  	              G_SIGNAL_RUN_FIRST,
-  	              G_STRUCT_OFFSET (BamfIndicatorSourceClass, indicator_closed),
-  	              NULL, NULL,
-  	              g_cclosure_marshal_VOID__OBJECT,
-  	              G_TYPE_NONE, 1,
-  	              BAMF_TYPE_INDICATOR);
-
-  dbus_g_object_type_install_info (BAMF_TYPE_INDICATOR_SOURCE,
-				   &dbus_glib_bamf_indicator_source_object_info);
-
-  g_type_class_add_private (object_class, sizeof (BamfIndicatorSourcePrivate));
+    g_signal_new ("indicator-closed",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (BamfIndicatorSourceClass, indicator_closed),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  BAMF_TYPE_INDICATOR);
 }
 
 static void
 bamf_indicator_source_init (BamfIndicatorSource *self)
 {
   self->priv = BAMF_INDICATOR_SOURCE_GET_PRIVATE (self);
+
+  /* Registering signal callbacks to reply to dbus method calls */
+  g_signal_connect (self, "handle-approve-item",
+                    G_CALLBACK (on_dbus_handle_approve_item), self);
 }
 
 static BamfIndicatorSource *approver = NULL;
@@ -360,6 +417,7 @@
 bamf_indicator_source_get_default ()
 {
   if (!approver)
-    return approver = g_object_new (BAMF_TYPE_INDICATOR_SOURCE, NULL);
-  return BAMF_INDICATOR_SOURCE (g_object_ref (approver));
+    approver = g_object_new (BAMF_TYPE_INDICATOR_SOURCE, NULL);
+
+  return approver;
 }
 
=== modified file 'src/bamf-indicator-source.h'
--- src/bamf-indicator-source.h	2010-08-18 23:22:58 +0000
+++ src/bamf-indicator-source.h	2012-01-19 19:16:25 +0000
@@ -1,23 +1,21 @@
 /*
- * bamf-notification-approver.h
- * This file is part of BAMF
- *
- * Copyright (C) 2010 - Jason Smith
- *
- * BAMF is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * BAMF is distributed in the hope that it will be useful,
+ * Copyright (C) 2010-2011 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 BAMF; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
+ *
  */
 
 #ifndef __BAMF_INDICATOR_SOURCE_H__
@@ -25,6 +23,7 @@
 
 #include <glib-object.h>
 #include "bamf-indicator.h"
+#include "bamf-gdbus-indicator-source-generated.h"
 
 G_BEGIN_DECLS
 
@@ -48,13 +47,13 @@
 };
 
 struct _BamfIndicatorSource {
-  GObject parent;
-	
+  StatusNotifierApproverSkeleton parent;
+
   BamfIndicatorSourcePrivate *priv;
 };
 
 struct _BamfIndicatorSourceClass {
-  GObjectClass parent_class;
+  StatusNotifierApproverSkeletonClass parent_class;
   
   /*< signals >*/
   void (*indicator_opened) (BamfIndicatorSource *approver, BamfIndicator *indicator);
@@ -73,13 +72,11 @@
 GList * bamf_indicator_source_get_indicators (BamfIndicatorSource *self);
 
 gboolean bamf_indicator_source_approve_item (BamfIndicatorSource *self,
-                                                  const char *id,
-                                                  const char *category,
-                                                  guint32 pid,
-                                                  const char *address,
-                                                  const char *proxy,
-                                                  gboolean *approve,
-                                                  GError **error);
+                                             const char *id,
+                                             const char *category,
+                                             guint32 pid,
+                                             const char *address,
+                                             const char *proxy);
                                                   
 void bamf_indicator_source_set_behavior (BamfIndicatorSource *self,
                                          gint32 behavior);
 
=== modified file 'src/bamf-indicator.c'
--- src/bamf-indicator.c	2011-01-14 15:53:35 +0000
+++ src/bamf-indicator.c	2012-01-19 19:16:25 +0000
@@ -1,30 +1,27 @@
 /*
- * bamf-indicator.c
- * This file is part of BAMF
- *
- * Copyright (C) 2010 - Jason Smith
- *
- * BAMF is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * BAMF is distributed in the hope that it will be useful,
+ * Copyright (C) 2010-2011 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
- * MERCHANINDICATORILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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 BAMF; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
+ *
  */
 
 #include "bamf-indicator.h"
-#include "bamf-indicator-glue.h"
-
-
-#define BAMF_INDICATOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), BAMF_TYPE_INDICATOR, BamfIndicatorPrivate))
+
+#define BAMF_INDICATOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), \
+                                           BAMF_TYPE_INDICATOR, BamfIndicatorPrivate))
 
 enum
 {
@@ -39,34 +36,35 @@
 
 struct _BamfIndicatorPrivate
 {
+  BamfDBusItemIndicator *dbus_iface;
   char *id;
   char *path;
   char *address;
   guint32 pid;
-  DBusGProxy *proxy;
+  GDBusProxy *proxy;
 };
 
 G_DEFINE_TYPE (BamfIndicator, bamf_indicator, BAMF_TYPE_VIEW)
 
-char *
+const char *
 bamf_indicator_get_path (BamfIndicator *self)
 {
   g_return_val_if_fail (BAMF_IS_INDICATOR (self), NULL);
-  return g_strdup (self->priv->path);
+  return self->priv->path;
 }
 
-char *
+const char *
 bamf_indicator_get_address (BamfIndicator *self)
 {
   g_return_val_if_fail (BAMF_IS_INDICATOR (self), NULL);
-  return g_strdup (self->priv->address);
+  return self->priv->address;
 }
 
-char *
+const char *
 bamf_indicator_get_id (BamfIndicator *self)
 {
   g_return_val_if_fail (BAMF_IS_INDICATOR (self), NULL);
-  return g_strdup (self->priv->id);
+  return self->priv->id;
 }
 
 guint32
@@ -86,10 +84,10 @@
          pid == self->priv->pid;         
 }
 
-static char *
+static const char *
 bamf_indicator_get_view_type (BamfView *view)
 {
-  return g_strdup ("indicator");
+  return "indicator";
 }
 
 static char *
@@ -104,7 +102,8 @@
 }
 
 static void
-bamf_indicator_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+bamf_indicator_set_property (GObject *object, guint property_id,
+                             const GValue *value, GParamSpec *pspec)
 {
   BamfIndicator *self;
 
@@ -129,7 +128,7 @@
         break;
 
       default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
 }
 
@@ -159,53 +158,96 @@
         break;
 
       default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
 }
 
 static void
-bamf_indicator_on_destroy (DBusGProxy *proxy, BamfIndicator *self)
+bamf_indicator_on_destroy (GObject *object, GParamSpec *pspec, BamfIndicator *self)
 {
+  g_object_unref (self->priv->proxy);
+  self->priv->proxy = NULL;
+
   bamf_view_close (BAMF_VIEW (self));
 }
 
+static gboolean
+on_dbus_handle_path (BamfDBusItemIndicator *interface,
+                     GDBusMethodInvocation *invocation,
+                     BamfIndicator *self)
+{
+  const char *path = bamf_indicator_get_path (self);
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(s)", path ? path : ""));
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_address (BamfDBusItemIndicator *interface,
+                        GDBusMethodInvocation *invocation,
+                        BamfIndicator *self)
+{
+  const char *address = bamf_indicator_get_address (self);
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(s)", address ? address : ""));
+
+  return TRUE;
+}
+
 static void
 bamf_indicator_constructed (GObject *object)
 {
   BamfIndicator *self;
   BamfIndicatorPrivate *priv;
-  DBusGProxy *proxy;
-  DBusGConnection *bus;
+  GDBusProxy *proxy;
   GError *error = NULL;
 
   if (G_OBJECT_CLASS (bamf_indicator_parent_class)->constructed)
     G_OBJECT_CLASS (bamf_indicator_parent_class)->constructed (object);
-  
+
   self = BAMF_INDICATOR (object);
   priv = self->priv;
-  
-  bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-  
-  if (!bus)
-    {
-      g_warning ("Could not get session bus\n");
-      return;
-    }
-  
-  error = NULL;
-  if (!(proxy = dbus_g_proxy_new_for_name_owner (bus, 
-                                                 priv->address,
-                                                 priv->path,
-                                                 "org.ayatana.indicator.application.service",
-                                                 &error)))
-    {
-      g_warning ("Could not setup proxy: %s %s\n", priv->address, priv->path);
-      return;
-    }
-  
-  priv->proxy = proxy;
-  
-  g_signal_connect (G_OBJECT (proxy), "destroy", (GCallback) bamf_indicator_on_destroy, self);
+
+  proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                         G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES|
+                                         G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS|
+                                         G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                                         NULL,
+                                         priv->address,
+                                         priv->path,
+                                         "org.ayatana.indicator.application.service",
+                                         NULL,
+                                         &error);
+
+  if (error)
+    {
+      g_debug ("Could not setup proxy: %s %s: %s", priv->address, priv->path,
+                                                   error->message);
+      g_error_free (error);
+    }
+  else
+    {
+      gchar *owner = g_dbus_proxy_get_name_owner (proxy);
+
+      if (owner)
+        {
+          g_free (owner);
+
+          g_signal_connect (G_OBJECT (proxy), "notify::g-name-owner",
+                            G_CALLBACK (bamf_indicator_on_destroy), self);
+
+          if (priv->proxy)
+            g_object_unref (priv->proxy);
+
+          priv->proxy = proxy;
+        }
+      else
+        {
+           g_debug ("Failed to get notification approver proxy: no owner available");
+           g_object_unref (proxy);
+        }
+    }
 }
 
 static void
@@ -243,17 +285,31 @@
 }
 
 static void
+bamf_indicator_finalize (GObject *object)
+{
+  BamfIndicatorPrivate *priv;
+  
+  priv = BAMF_INDICATOR (object)->priv;
+
+  g_object_unref (priv->dbus_iface);
+
+  G_OBJECT_CLASS (bamf_indicator_parent_class)->finalize (object);
+}
+
+static void
 bamf_indicator_class_init (BamfIndicatorClass *klass)
 {
   GParamSpec *pspec;
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   BamfViewClass *view_class = BAMF_VIEW_CLASS (klass);
-	
-  object_class->constructed  = bamf_indicator_constructed;
-  object_class->get_property = bamf_indicator_get_property;
-  object_class->set_property = bamf_indicator_set_property;
-  object_class->dispose      = bamf_indicator_dispose;
-  view_class->view_type      = bamf_indicator_get_view_type;
+
+  object_class->constructed   = bamf_indicator_constructed;
+  object_class->get_property  = bamf_indicator_get_property;
+  object_class->set_property  = bamf_indicator_set_property;
+  object_class->dispose       = bamf_indicator_dispose;
+  object_class->finalize      = bamf_indicator_finalize;
+
+  view_class->view_type       = bamf_indicator_get_view_type;
   view_class->stable_bus_name = bamf_indicator_get_stable_bus_name;
 
   pspec = g_param_spec_string ("address", "address", "address", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
@@ -268,9 +324,6 @@
   pspec = g_param_spec_uint ("pid", "pid", "pid", 0, G_MAXUINT32, 0, G_PARAM_READWRITE);
   g_object_class_install_property (object_class, PROP_PID, pspec);
 
-  dbus_g_object_type_install_info (BAMF_TYPE_INDICATOR,
-				   &dbus_glib_bamf_indicator_object_info);
-
   g_type_class_add_private (object_class, sizeof (BamfIndicatorPrivate));
 }
 
@@ -278,6 +331,19 @@
 bamf_indicator_init (BamfIndicator *self)
 {
   self->priv = BAMF_INDICATOR_GET_PRIVATE (self);
+
+  self->priv->dbus_iface = bamf_dbus_item_indicator_skeleton_new ();
+
+  /* Registering signal callbacks to reply to dbus method calls */
+  g_signal_connect (self->priv->dbus_iface, "handle-path",
+                    G_CALLBACK (on_dbus_handle_path), self);
+
+  g_signal_connect (self->priv->dbus_iface, "handle-address",
+                    G_CALLBACK (on_dbus_handle_address), self);
+
+  /* Setting the interface for the dbus object */
+  bamf_dbus_item_object_skeleton_set_indicator (BAMF_DBUS_ITEM_OBJECT_SKELETON (self),
+                                                self->priv->dbus_iface);
 }
 
 BamfIndicator *
 
=== modified file 'src/bamf-indicator.h'
--- src/bamf-indicator.h	2010-07-09 23:22:44 +0000
+++ src/bamf-indicator.h	2012-01-19 19:16:25 +0000
@@ -1,23 +1,21 @@
 /*
- * bamf-indicator.h
- * This file is part of BAMF
- *
- * Copyright (C) 2010 - Jason Smith
- *
- * BAMF is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * BAMF is distributed in the hope that it will be useful,
+ * Copyright (C) 2010-2011 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 BAMF; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
+ *
  */
 
 #ifndef __BAMF_INDICATOR_H__
@@ -42,7 +40,7 @@
 
 struct _BamfIndicator {
   BamfView parent;
-	
+
   BamfIndicatorPrivate *priv;
 };
 
@@ -52,23 +50,23 @@
 
 GType bamf_indicator_get_type (void) G_GNUC_CONST;
 
-char       * bamf_indicator_get_id            (BamfIndicator *self);
-
-char       * bamf_indicator_get_path          (BamfIndicator *self);
-
-char       * bamf_indicator_get_address       (BamfIndicator *self);
-
-guint32      bamf_indicator_get_pid           (BamfIndicator *self);
-
-gboolean     bamf_indicator_matches_signature (BamfIndicator *self, 
-                                               gint pid, 
-                                               const char *address, 
-                                               const char *path);
-
-BamfIndicator *bamf_indicator_new (const char *id,
-                                   const char *proxy, 
-                                   const char *address, 
-                                   guint32 pid);
+const char    * bamf_indicator_get_id            (BamfIndicator *self);
+
+const char    * bamf_indicator_get_path          (BamfIndicator *self);
+
+const char    * bamf_indicator_get_address       (BamfIndicator *self);
+
+guint32         bamf_indicator_get_pid           (BamfIndicator *self);
+
+gboolean        bamf_indicator_matches_signature (BamfIndicator *self, 
+                                                  gint pid, 
+                                                  const char *address, 
+                                                  const char *path);
+
+BamfIndicator * bamf_indicator_new               (const char *id,
+                                                  const char *proxy, 
+                                                  const char *address, 
+                                                  guint32 pid);
 
 G_END_DECLS
 
 
=== modified file 'src/bamf-marshal.list'
--- src/bamf-marshal.list	2010-08-18 23:22:58 +0000
+++ src/bamf-marshal.list	2012-01-19 19:16:25 +0000
@@ -1,9 +1,10 @@
 # Marshaller definitions to be generated.
 # 
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2011 Canonical Ltd.
 # 
 # Authors:
 #    Jason Smith <[e-mail]>
+#    Marco Trevisan (Treviño) <[e-mail]>
 # 
 # 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 
@@ -17,8 +18,4 @@
 # You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VOID: BOOL, STRING, STRING
-VOID: STRING, STRING
 VOID: STRING, STRING, STRING
-VOID: OBJECT, OBJECT
-VOID: STRING, INT, STRING, STRING, STRING
 
=== removed file 'src/bamf-matcher-glue.xml'
--- src/bamf-matcher-glue.xml	2010-09-08 23:38:35 +0000
+++ src/bamf-matcher-glue.xml	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/org/ayatana/bamf">
-
-	<interface name="org.ayatana.bamf.matcher">
-
-		<signal name="ViewOpened">
-			<arg type="s" name="path" direction="out" />
-			<arg type="s" name="type" direction="out" />
-		</signal>
-
-		<signal name="ViewClosed">
-			<arg type="s" name="path" direction="out" />
-			<arg type="s" name="type" direction="out" />
-		</signal>
-		
-		<signal name="ActiveWindowChanged">
-			<arg type="s" name="old" direction="out" />
-			<arg type="s" name="new" direction="out" />
-		</signal>
-		
-		<signal name="ActiveApplicationChanged">
-			<arg type="s" name="old" direction="out" />
-			<arg type="s" name="new" direction="out" />
-		</signal>
-		
-		<method name="ActiveApplication">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_get_active_application" />
-			<arg type="s" name="application" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-		<method name="ActiveWindow">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_get_active_window" />
-			<arg type="s" name="window" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-		<method name="ApplicationForXid">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_application_for_xid" />
-			<arg type="u" name="xid" direction="in" />
-			<arg type="s" name="application" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="ApplicationIsRunning">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_application_is_running" />
-			<arg type="s" name="application" direction="in" />
-			<arg type="b" name="running" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="ApplicationPaths">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_application_dbus_paths" />
-			<arg type="as" name="paths" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-		<method name="WindowPaths">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_window_dbus_paths" />
-			<arg type="as" name="paths" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="PathForApplication">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_dbus_path_for_application" />
-			<arg type="s" name="applicaiton" direction="in" />
-			<arg type="s" name="path" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="RegisterFavorites">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_register_favorites" />
-			<arg type="as" name="favorites" direction="in" />
-		</method>
-
-		<method name="RunningApplications">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_running_application_paths" />
-			<arg type="as" name="paths" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="TabPaths">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_tab_dbus_paths" />
-			<arg type="as" name="paths" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="XidsForApplication">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_matcher_xids_for_application" />
-			<arg type="s" name="application" direction="in" />
-			<arg type="au" name="xids" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-	</interface>
-
-</node>
 
=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2011-12-15 11:30:52 +0000
+++ src/bamf-matcher.c	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -22,9 +22,7 @@
 
 #include <gdk/gdkx.h>
 
-#include "bamf-marshal.h"
 #include "bamf-matcher.h"
-#include "bamf-matcher-glue.h"
 #include "bamf-application.h"
 #include "bamf-window.h"
 #include "bamf-legacy-window.h"
@@ -32,16 +30,12 @@
 #include "bamf-legacy-screen.h"
 #include "bamf-indicator-source.h"
 
-G_DEFINE_TYPE (BamfMatcher, bamf_matcher, G_TYPE_OBJECT);
+G_DEFINE_TYPE (BamfMatcher, bamf_matcher, BAMF_DBUS_TYPE_MATCHER_SKELETON);
 #define BAMF_MATCHER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
-BAMF_TYPE_MATCHER, BamfMatcherPrivate))
+                                       BAMF_TYPE_MATCHER, BamfMatcherPrivate))
 
 enum
 {
-  VIEW_OPENED,
-  VIEW_CLOSED,
-  ACTIVE_APPLICATION_CHANGED,
-  ACTIVE_WINDOW_CHANGED,
   FAVORITES_CHANGED,
 
   LAST_SIGNAL,
@@ -49,16 +43,6 @@
 
 static guint matcher_signals[LAST_SIGNAL] = { 0 };
 
-typedef struct _OpenOfficeTimeoutArgs OpenOfficeTimeoutArgs;
-
-struct _OpenOfficeTimeoutArgs
-{
-  BamfMatcher *matcher;
-  BamfLegacyWindow *window;
-  int count;
-};
-
-
 struct _BamfMatcherPrivate
 {
   GArray          * bad_prefixes;
@@ -103,11 +87,9 @@
       else
         priv->active_app = NULL;
 
-      g_signal_emit (matcher,
-                     matcher_signals[ACTIVE_APPLICATION_CHANGED],
-                     0,
-                     BAMF_IS_VIEW (last) ? bamf_view_get_path (BAMF_VIEW (last)) : NULL,
-                     BAMF_IS_VIEW (priv->active_app) ? bamf_view_get_path (BAMF_VIEW (priv->active_app)) : NULL);
+      g_signal_emit_by_name (matcher, "active-application-changed",
+                             BAMF_IS_VIEW (last) ? bamf_view_get_path (BAMF_VIEW (last)) : "",
+                             BAMF_IS_VIEW (priv->active_app) ? bamf_view_get_path (BAMF_VIEW (priv->active_app)) : "");
     }
   else if (BAMF_IS_WINDOW (view))
     {
@@ -127,11 +109,10 @@
       else
         priv->active_win = NULL;
 
-      g_signal_emit (matcher,
-                     matcher_signals[ACTIVE_WINDOW_CHANGED],
-                     0,
-                     BAMF_IS_VIEW (last) ? bamf_view_get_path (BAMF_VIEW (last)) : NULL,
-                     BAMF_IS_VIEW (priv->active_win) ? bamf_view_get_path (BAMF_VIEW (priv->active_win)) : NULL);
+
+      g_signal_emit_by_name (matcher, "active-window-changed",
+                             BAMF_IS_VIEW (last) ? bamf_view_get_path (BAMF_VIEW (last)) : "",
+                             BAMF_IS_VIEW (priv->active_win) ? bamf_view_get_path (BAMF_VIEW (priv->active_win)) : "");
     }
 }
 
@@ -146,9 +127,12 @@
 static void
 bamf_matcher_register_view (BamfMatcher *self, BamfView *view)
 {
-  char * path, * type;
+  const char *path, *type;
+  GDBusConnection *connection;
+  GDBusInterfaceSkeleton *dbus_interface = G_DBUS_INTERFACE_SKELETON (self);
 
-  path = bamf_view_export_on_bus (view);
+  connection = g_dbus_interface_skeleton_get_connection (dbus_interface);
+  path = bamf_view_export_on_bus (view, connection);
   type = bamf_view_get_view_type (view);
 
   g_signal_connect (G_OBJECT (view), "closed-internal",
@@ -159,8 +143,7 @@
   self->priv->views = g_list_prepend (self->priv->views, view);
   g_object_ref (view);
 
-  g_signal_emit (self, matcher_signals[VIEW_OPENED],0, path, type);
-  g_free (type);
+  g_signal_emit_by_name (self, "view-opened", path, type);
   
   // trigger manually since this is already active
   if (bamf_view_is_active (view))
@@ -171,12 +154,12 @@
 bamf_matcher_unregister_view (BamfMatcher *self, BamfView *view, gboolean unref)
 {
   const char * path;
-  char * type;
+  const char * type;
 
   path = bamf_view_get_path (view);
   type = bamf_view_get_view_type (view);
 
-  g_signal_emit (self, matcher_signals[VIEW_CLOSED],0, path, type);
+  g_signal_emit_by_name (self, "view-closed", path, type);
 
   g_signal_handlers_disconnect_by_func (G_OBJECT (view), on_view_closed, self);
   g_signal_handlers_disconnect_by_func (G_OBJECT (view), on_view_active_changed, self);
@@ -186,8 +169,6 @@
       self->priv->views = g_list_remove (self->priv->views, view);
       g_object_unref (view);
     }
-
-  g_free (type);
 }
 
 static char *
@@ -317,7 +298,8 @@
   gboolean regexFail;
   GRegex *regex;
 
-  g_return_val_if_fail ((execString && execString[0] != '\0'), g_strdup (execString));
+  if (!execString || (execString && execString[0] == '\0'))
+    return NULL;
 
   exec = g_utf8_casefold (execString, -1);
   parts = g_strsplit (exec, " ", 0);
@@ -983,7 +965,7 @@
   path = g_file_get_path (file);
   filetype = g_file_query_file_type (file, G_FILE_QUERY_INFO_NONE, NULL);
   monitored_dir = g_object_get_data (G_OBJECT (monitor), "root");
-  
+
   if (!g_str_has_suffix (path, ".desktop") &&
       filetype != G_FILE_TYPE_DIRECTORY &&
       type != G_FILE_MONITOR_EVENT_DELETED)
@@ -1367,7 +1349,7 @@
       g_free (exec_string);
     }
 
-  if (g_list_length (result) > 0)
+  if (result)
     {
       result = g_list_reverse (result);
       return result;
@@ -1885,7 +1867,7 @@
 
 void
 bamf_matcher_load_desktop_file (BamfMatcher * self,
-                                char * desktop_file)
+                                const char * desktop_file)
 {
   g_return_if_fail (BAMF_IS_MATCHER (self));
 
@@ -1937,7 +1919,7 @@
   return 0;
 }
 
-char *
+const char *
 bamf_matcher_get_active_application (BamfMatcher *matcher)
 {
   GList *l;
@@ -1957,14 +1939,14 @@
 
       if (bamf_view_is_active (view))
         {
-          return g_strdup (bamf_view_get_path (view));
+          return bamf_view_get_path (view);
         }
     }
 
-  return NULL;
+  return "";
 }
 
-char *
+const char *
 bamf_matcher_get_active_window (BamfMatcher *matcher)
 {
   GList *l;
@@ -1984,14 +1966,14 @@
 
       if (bamf_view_is_active (view))
         {
-          return g_strdup (bamf_view_get_path (view));
+          return bamf_view_get_path (view);
         }
     }
 
-  return NULL;
+  return "";
 }
 
-char *
+const char *
 bamf_matcher_application_for_xid (BamfMatcher *matcher,
                                   guint32 xid)
 {
@@ -2012,16 +1994,16 @@
 
       if (bamf_application_manages_xid (BAMF_APPLICATION (view), xid))
         {
-          return g_strdup (bamf_view_get_path (view));
+          return bamf_view_get_path (view);
         }
     }
 
-  return NULL;
+  return "";
 }
 
 gboolean
 bamf_matcher_application_is_running (BamfMatcher *matcher,
-                                     char *application)
+                                     const char *application)
 {
   char * desktop_file;
   GList *l;
@@ -2051,22 +2033,21 @@
   return FALSE;
 }
 
-char **
+GVariant *
 bamf_matcher_window_dbus_paths (BamfMatcher *matcher)
 {
-  char ** paths;
-  int i;
   GList *l;
   BamfView *view;
   BamfMatcherPrivate *priv;
+  GVariantBuilder b;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
 
+  g_variant_builder_init (&b, G_VARIANT_TYPE ("(as)"));
+  g_variant_builder_open (&b, G_VARIANT_TYPE ("as"));
+
   priv = matcher->priv;
 
-  paths = g_malloc0 (sizeof (char *) * (g_list_length (priv->views) + 1));
-
-  i = 0;
   for (l = priv->views; l; l = l->next)
     {
       view = l->data;
@@ -2074,29 +2055,29 @@
       if (!BAMF_IS_WINDOW (view))
         continue;
 
-      paths[i] = g_strdup (bamf_view_get_path (view));
-      i++;
+      g_variant_builder_add (&b, "s", bamf_view_get_path (view));
     }
 
-  return paths;
+  g_variant_builder_close (&b);
+
+  return g_variant_builder_end (&b);
 }
 
-char **
+GVariant *
 bamf_matcher_application_dbus_paths (BamfMatcher *matcher)
 {
-  char ** paths;
-  int i;
   GList *l;
   BamfView *view;
   BamfMatcherPrivate *priv;
+  GVariantBuilder b;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
 
+  g_variant_builder_init (&b, G_VARIANT_TYPE ("(as)"));
+  g_variant_builder_open (&b, G_VARIANT_TYPE ("as"));
+
   priv = matcher->priv;
 
-  paths = g_malloc0 (sizeof (char *) * (g_list_length (priv->views) + 1));
-
-  i = 0;
   for (l = priv->views; l; l = l->next)
     {
       view = l->data;
@@ -2104,18 +2085,19 @@
       if (!BAMF_IS_APPLICATION (view))
         continue;
 
-      paths[i] = g_strdup (bamf_view_get_path (view));
-      i++;
+      g_variant_builder_add (&b, "s", bamf_view_get_path (view));
     }
 
-  return paths;
+  g_variant_builder_close (&b);
+
+  return g_variant_builder_end (&b);
 }
 
-char *
+const char *
 bamf_matcher_dbus_path_for_application (BamfMatcher *matcher,
-                                        char *application)
+                                        const char *application)
 {
-  char * path = NULL;
+  const char * path = "";
   char * desktop_file;
   GList *l;
   BamfView *view;
@@ -2135,7 +2117,7 @@
       desktop_file = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
       if (g_strcmp0 (desktop_file, application) == 0)
         {
-          path = g_strdup (bamf_view_get_path (view));
+          path = bamf_view_get_path (view);
         }
       g_free (desktop_file);
     }
@@ -2151,18 +2133,16 @@
   return matcher->priv->favorites;
 }
 
-gboolean
+void
 bamf_matcher_register_favorites (BamfMatcher *matcher,
-                                 char **favorites,
-                                 GError *error)
+                                 const char **favorites)
 {
-  char *fav;
-  char **favs;
+  const char *fav;
+  const char **favs;
   BamfMatcherPrivate *priv;
-  
-  g_return_val_if_fail (BAMF_IS_MATCHER (matcher), TRUE);
-  g_return_val_if_fail (favorites, TRUE);
-  
+
+  g_return_if_fail (BAMF_IS_MATCHER (matcher));
+  g_return_if_fail (favorites);
   priv = matcher->priv;
   
   for (favs = favorites; *favs; favs++)
@@ -2171,33 +2151,29 @@
       /* ignore things already in the list */
       if (g_list_find_custom (priv->favorites, fav, (GCompareFunc) g_strcmp0))
         continue;
-      
-      
+
       priv->favorites = g_list_prepend (priv->favorites, g_strdup (fav));
       bamf_matcher_load_desktop_file (matcher, fav);
     }
-  
+
   g_signal_emit (matcher, matcher_signals[FAVORITES_CHANGED], 0);
-
-  return TRUE;
 }
 
-char **
+GVariant *
 bamf_matcher_running_application_paths (BamfMatcher *matcher)
 {
-  char ** paths;
-  int i;
   GList *l;
   BamfView *view;
   BamfMatcherPrivate *priv;
+  GVariantBuilder b;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
 
+  g_variant_builder_init (&b, G_VARIANT_TYPE ("(as)"));
+  g_variant_builder_open (&b, G_VARIANT_TYPE ("as"));
+
   priv = matcher->priv;
 
-  paths = g_malloc0 (sizeof (char *) * (g_list_length (priv->views) + 1));
-
-  i = 0;
   for (l = priv->views; l; l = l->next)
     {
       view = l->data;
@@ -2205,24 +2181,31 @@
       if (!BAMF_IS_APPLICATION (view) || !bamf_view_is_running (view))
         continue;
 
-      paths[i] = g_strdup (bamf_view_get_path (view));
-      i++;
+      g_variant_builder_add (&b, "s", bamf_view_get_path (view));
     }
 
-  return paths;
+  g_variant_builder_close (&b);
+
+  return g_variant_builder_end (&b);
 }
 
-char **
+GVariant *
 bamf_matcher_tab_dbus_paths (BamfMatcher *matcher)
 {
-  return NULL;
+  GVariantBuilder b;
+
+  g_variant_builder_init (&b, G_VARIANT_TYPE ("(as)"));
+  g_variant_builder_open (&b, G_VARIANT_TYPE ("as"));
+  g_variant_builder_close (&b);
+  return g_variant_builder_end (&b);
 }
 
-GArray *
+GVariant *
 bamf_matcher_xids_for_application (BamfMatcher *matcher,
-                                   char *application)
+                                   const char *application)
 {
-  GArray * xids = NULL;
+  GVariantBuilder b;
+  GVariant *xids;
   char * desktop_file;
   GList *l;
   BamfView *view;
@@ -2231,6 +2214,7 @@
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
 
   priv = matcher->priv;
+  xids = NULL;
 
   for (l = priv->views; l; l = l->next)
     {
@@ -2249,19 +2233,159 @@
       g_free (desktop_file);
     }
 
+  if (!xids)
+    {
+      g_variant_builder_init (&b, G_VARIANT_TYPE ("(au)"));
+      g_variant_builder_open (&b, G_VARIANT_TYPE ("au"));
+      g_variant_builder_close (&b);
+      xids = g_variant_builder_end (&b);
+    }
+
   return xids;
 }
 
+static gboolean
+on_dbus_handle_xids_for_application (BamfDBusMatcher *interface,
+                                     GDBusMethodInvocation *invocation,
+                                     const gchar *application,
+                                     BamfMatcher *self)
+{
+  GVariant *xids = bamf_matcher_xids_for_application (self, application);
+  g_dbus_method_invocation_return_value (invocation, xids);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_tab_paths (BamfDBusMatcher *interface,
+                          GDBusMethodInvocation *invocation,
+                          BamfMatcher *self)
+{
+  GVariant *tab_paths = bamf_matcher_tab_dbus_paths (self);
+  g_dbus_method_invocation_return_value (invocation, tab_paths);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_application_paths (BamfDBusMatcher *interface,
+                                  GDBusMethodInvocation *invocation,
+                                  BamfMatcher *self)
+{
+  GVariant *app_paths = bamf_matcher_application_dbus_paths (self);
+  g_dbus_method_invocation_return_value (invocation, app_paths);
+
+  return TRUE;
+}
+
+
+static gboolean
+on_dbus_handle_window_paths (BamfDBusMatcher *interface,
+                             GDBusMethodInvocation *invocation,
+                             BamfMatcher *self)
+{
+  GVariant *win_paths = bamf_matcher_window_dbus_paths (self);
+  g_dbus_method_invocation_return_value (invocation, win_paths);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_running_applications (BamfDBusMatcher *interface,
+                                     GDBusMethodInvocation *invocation,
+                                     BamfMatcher *self)
+{
+  GVariant *running_apps = bamf_matcher_running_application_paths (self);
+  g_dbus_method_invocation_return_value (invocation, running_apps);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_active_application (BamfDBusMatcher *interface,
+                                   GDBusMethodInvocation *invocation,
+                                   BamfMatcher *self)
+{
+  const gchar *active_app = bamf_matcher_get_active_application (self);
+
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(s)", active_app));
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_active_window (BamfDBusMatcher *interface,
+                              GDBusMethodInvocation *invocation,
+                              BamfMatcher *self)
+{
+  const gchar *active_win = bamf_matcher_get_active_window (self);
+
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(s)", active_win));
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_application_is_running (BamfDBusMatcher *interface,
+                                       GDBusMethodInvocation *invocation,
+                                       const gchar *application,
+                                       BamfMatcher *self)
+{
+  gboolean is_running = bamf_matcher_application_is_running (self, application);
+
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(b)", is_running));
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_register_favorites (BamfDBusMatcher *interface,
+                                   GDBusMethodInvocation *invocation,
+                                   const char **favorites,
+                                   BamfMatcher *self)
+{
+  bamf_matcher_register_favorites (self, favorites);
+  g_dbus_method_invocation_return_value (invocation, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_path_for_application (BamfDBusMatcher *interface,
+                                     GDBusMethodInvocation *invocation,
+                                     const gchar *application,
+                                     BamfMatcher *self)
+{
+  const gchar *app_path = bamf_matcher_dbus_path_for_application (self, application);
+
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(s)", app_path));
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_application_for_xid (BamfDBusMatcher *interface,
+                                    GDBusMethodInvocation *invocation,
+                                    guint xid,
+                                    BamfMatcher *self)
+{
+  const gchar *app_path = bamf_matcher_application_for_xid (self, xid);
+
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(s)", app_path));
+
+  return TRUE;
+}
+
 static void
 bamf_matcher_init (BamfMatcher * self)
 {
+  BamfMatcherPrivate *priv;
+  BamfLegacyScreen *screen;
+  BamfIndicatorSource *approver;
   GArray *prefixstrings;
   int i;
-  DBusGConnection *bus;
-  GError *error = NULL;
-  BamfMatcherPrivate *priv;
-  BamfLegacyScreen *screen;
-  BamfIndicatorSource *approver;
 
   priv = self->priv = BAMF_MATCHER_GET_PRIVATE (self);
 
@@ -2294,11 +2418,56 @@
 
   XSetErrorHandler (x_error_handler);
 
-  bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-
-  g_return_if_fail (bus);
-
-  dbus_g_connection_register_g_object (bus, BAMF_MATCHER_PATH, G_OBJECT (self));
+  /* Registering signal callbacks to reply to dbus method calls */
+  g_signal_connect (self, "handle-xids-for-application",
+                    G_CALLBACK (on_dbus_handle_xids_for_application), self);
+
+  g_signal_connect (self, "handle-tab-paths",
+                    G_CALLBACK (on_dbus_handle_tab_paths), self);
+
+  g_signal_connect (self, "handle-application-paths",
+                    G_CALLBACK (on_dbus_handle_application_paths), self);
+
+  g_signal_connect (self, "handle-window-paths",
+                    G_CALLBACK (on_dbus_handle_window_paths), self);
+
+  g_signal_connect (self, "handle-running-applications",
+                    G_CALLBACK (on_dbus_handle_running_applications), self);
+
+  g_signal_connect (self, "handle-active-window",
+                    G_CALLBACK (on_dbus_handle_active_window), self);
+
+  g_signal_connect (self, "handle-active-application",
+                    G_CALLBACK (on_dbus_handle_active_application), self);
+
+  g_signal_connect (self, "handle-application-is-running",
+                    G_CALLBACK (on_dbus_handle_application_is_running), self);
+
+  g_signal_connect (self, "handle-register-favorites",
+                    G_CALLBACK (on_dbus_handle_register_favorites), self);
+
+  g_signal_connect (self, "handle-path-for-application",
+                    G_CALLBACK (on_dbus_handle_path_for_application), self);
+
+  g_signal_connect (self, "handle-application-for-xid",
+                    G_CALLBACK (on_dbus_handle_application_for_xid), self);
+}
+
+static void
+bamf_matcher_dispose (GObject *object)
+{
+  BamfMatcher *self = (BamfMatcher *) object;
+  BamfMatcherPrivate *priv = self->priv;
+  GList *l;
+
+  for (l = priv->views; l; l = l->next)
+    {
+      bamf_matcher_unregister_view (self, (BamfView*)l->data, FALSE);
+    }
+  g_list_free_full (priv->views, g_object_unref);
+  priv->views = NULL;
+
+  G_OBJECT_CLASS (bamf_matcher_parent_class)->dispose (object);
 }
 
 static void
@@ -2322,12 +2491,7 @@
   g_hash_table_destroy (priv->desktop_class_table);
   g_hash_table_destroy (priv->registered_pids);
 
-  for (l = priv->views; l; l = l->next)
-    {
-      bamf_matcher_unregister_view (self, (BamfView*)l->data, FALSE);
-    }
   g_list_free_full (priv->views, g_object_unref);
-  priv->views = NULL;
 
   for (l = priv->monitors; l; l = l->next)
     {
@@ -2350,49 +2514,11 @@
 bamf_matcher_class_init (BamfMatcherClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
   g_type_class_add_private (klass, sizeof (BamfMatcherPrivate));
-
-  dbus_g_object_type_install_info (BAMF_TYPE_MATCHER,
-                                   &dbus_glib_bamf_matcher_object_info);
-
+  object_class->dispose = bamf_matcher_dispose;
   object_class->finalize = bamf_matcher_finalize;
 
-  matcher_signals [VIEW_OPENED] =
-    g_signal_new ("view-opened",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  0,
-                  0, NULL, NULL,
-                  bamf_marshal_VOID__STRING_STRING,
-                  G_TYPE_NONE, 2,
-                  G_TYPE_STRING, G_TYPE_STRING);
-
-  matcher_signals [VIEW_CLOSED] =
-    g_signal_new ("view-closed",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  0,
-                  0, NULL, NULL,
-                  bamf_marshal_VOID__STRING_STRING,
-                  G_TYPE_NONE, 2,
-                  G_TYPE_STRING, G_TYPE_STRING);
-
-  matcher_signals [ACTIVE_APPLICATION_CHANGED] =
-    g_signal_new ("active-application-changed",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  0,
-                  0, NULL, NULL,
-                  bamf_marshal_VOID__STRING_STRING,
-                  G_TYPE_NONE, 2,
-                  G_TYPE_STRING, G_TYPE_STRING);
-
-  matcher_signals [ACTIVE_WINDOW_CHANGED] =
-    g_signal_new ("active-window-changed",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  0,
-                  0, NULL, NULL,
-                  bamf_marshal_VOID__STRING_STRING,
-                  G_TYPE_NONE, 2,
-                  G_TYPE_STRING, G_TYPE_STRING);
- 
   matcher_signals [FAVORITES_CHANGED] =
     g_signal_new ("favorites-changed",
                   G_OBJECT_CLASS_TYPE (klass),
@@ -2410,8 +2536,7 @@
   if (!BAMF_IS_MATCHER (matcher))
     {
       matcher = (BamfMatcher *) g_object_new (BAMF_TYPE_MATCHER, NULL);
-      return matcher;
     }
 
-  return g_object_ref (G_OBJECT (matcher));
+  return matcher;
 }
 
=== modified file 'src/bamf-matcher.h'
--- src/bamf-matcher.h	2011-08-01 23:01:36 +0000
+++ src/bamf-matcher.h	2012-01-19 19:16:25 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
@@ -26,9 +27,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
 #include <gdk/gdk.h>
 #include <glib.h>
 #include <glib-object.h>
@@ -47,7 +45,7 @@
 #define BAMF_IS_MATCHER_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), BAMF_TYPE_MATCHER))
 #define BAMF_MATCHER_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_MATCHER, BamfMatcherClass))
 
-#define _NET_WM_DESKTOP_FILE			"_NET_WM_DESKTOP_FILE"
+#define _NET_WM_DESKTOP_FILE "_NET_WM_DESKTOP_FILE"
 
 typedef struct _BamfMatcher BamfMatcher;
 typedef struct _BamfMatcherClass BamfMatcherClass;
@@ -55,12 +53,12 @@
 
 struct _BamfMatcherClass
 {
-  GObjectClass parent;
+  BamfDBusMatcherSkeletonClass parent;
 };
 
 struct _BamfMatcher
 {
-  GObject parent;
+  BamfDBusMatcherSkeleton parent;
 
   /* private */
   BamfMatcherPrivate *priv;
@@ -69,41 +67,40 @@
 GType         bamf_matcher_get_type                      (void) G_GNUC_CONST;
 
 void          bamf_matcher_load_desktop_file             (BamfMatcher * self,
-                                                          char * desktop_file);
+                                                          const char * desktop_file);
 
 void          bamf_matcher_register_desktop_file_for_pid (BamfMatcher * self,
-                                                          const char * desktopFile,
+                                                          const char *application,
                                                           gint pid);
 
-char        * bamf_matcher_get_active_application        (BamfMatcher *matcher);
-
-char        * bamf_matcher_get_active_window             (BamfMatcher *matcher);
-
-char        * bamf_matcher_application_for_xid           (BamfMatcher *matcher,
+const char  * bamf_matcher_get_active_application        (BamfMatcher *matcher);
+
+const char  * bamf_matcher_get_active_window             (BamfMatcher *matcher);
+
+const char  * bamf_matcher_application_for_xid           (BamfMatcher *matcher,
                                                           guint32 xid);
 
 gboolean      bamf_matcher_application_is_running        (BamfMatcher *matcher,
-                                                          char *application);
-
-char       ** bamf_matcher_application_dbus_paths        (BamfMatcher *matcher);
-
-char       ** bamf_matcher_window_dbus_paths             (BamfMatcher *matcher);
-
-char        * bamf_matcher_dbus_path_for_application     (BamfMatcher *matcher,
-                                                          char *application);
-
-gboolean      bamf_matcher_register_favorites            (BamfMatcher *matcher,
-                                                          char **favorites,
-                                                          GError *error);
+                                                          const char *application);
+
+GVariant    * bamf_matcher_application_dbus_paths        (BamfMatcher *matcher);
+
+GVariant    * bamf_matcher_window_dbus_paths             (BamfMatcher *matcher);
+
+const char  * bamf_matcher_dbus_path_for_application     (BamfMatcher *matcher,
+                                                          const char *application);
+
+void          bamf_matcher_register_favorites            (BamfMatcher *matcher,
+                                                          const char **favorites);
                                                           
 GList       * bamf_matcher_get_favorites                 (BamfMatcher *matcher);
 
-char       ** bamf_matcher_running_application_paths     (BamfMatcher *matcher);
-
-char       ** bamf_matcher_tab_dbus_paths                (BamfMatcher *matcher);
-
-GArray      * bamf_matcher_xids_for_application          (BamfMatcher *matcher,
-                                                          char *application);
+GVariant    * bamf_matcher_running_application_paths     (BamfMatcher *matcher);
+
+GVariant    * bamf_matcher_tab_dbus_paths                (BamfMatcher *matcher);
+
+GVariant    * bamf_matcher_xids_for_application          (BamfMatcher *matcher,
+                                                          const char *application);
 
 BamfMatcher * bamf_matcher_get_default                   (void);
 
 
=== removed file 'src/bamf-tab-glue.xml'
--- src/bamf-tab-glue.xml	2010-05-18 19:55:44 +0000
+++ src/bamf-tab-glue.xml	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/org/ayatana/bamf">
-
-	<interface name="org.ayatana.bamf.tab">
-
-		<signal name="UriChanged">
-			<arg type="s" name="old" direction="out" />
-			<arg type="s" name="new" direction="out" />
-		</signal>
-
-		<method name="ShowTab">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_tab_show" />
-		</method>
-
-		<method name="ParentXid">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_tab_parent_xid" />
-			<arg type="u" name="xid" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="CurrentUri">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_tab_current_uri" />
-			<arg type="s" name="uri" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="Preview">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_tab_get_preview" />
-			<arg type="ay" name="data" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-	</interface>
-	
-</node>
 
=== modified file 'src/bamf-tab-source.c'
--- src/bamf-tab-source.c	2011-08-01 23:25:01 +0000
+++ src/bamf-tab-source.c	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -14,15 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
-
 #include "bamf-view.h"
 #include "bamf-tab-source.h"
 #include "bamf-tab.h"
 #include "bamf-marshal.h"
-#include <dbus/dbus-glib.h>
+#include "bamf-gdbus-browser-generated.h"
 
 G_DEFINE_TYPE (BamfTabSource, bamf_tab_source, G_TYPE_OBJECT);
 #define BAMF_TAB_SOURCE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
@@ -51,9 +51,9 @@
 
 struct _BamfTabSourcePrivate
 {
+  BamfDBusBrowser *proxy;
   char       *bus;
   char       *path;
-  DBusGProxy *proxy;
   GHashTable *tabs;
 };
 
@@ -67,12 +67,7 @@
   g_return_val_if_fail (BAMF_IS_TAB_SOURCE (self), NULL);
   priv = self->priv;
 
-  if (!dbus_g_proxy_call (priv->proxy,
-                          "TabIds",
-                          &error,
-                          G_TYPE_INVALID,
-                          G_TYPE_STRV, &ids,
-                          G_TYPE_INVALID))
+  if (!bamf_dbus_browser__call_tab_ids_sync (priv->proxy, &ids, NULL, &error))
     {
       g_warning ("Failed to get tab ids: %s", error->message);
       g_error_free (error);
@@ -83,8 +78,7 @@
 }
 
 void
-bamf_tab_source_show_tab (BamfTabSource *self,
-                          char *id)
+bamf_tab_source_show_tab (BamfTabSource *self, char *id)
 {
   BamfTabSourcePrivate *priv;
   GError *error = NULL;
@@ -92,36 +86,26 @@
   g_return_if_fail (BAMF_IS_TAB_SOURCE (self));
   priv = self->priv;
 
-  if (!dbus_g_proxy_call (priv->proxy,
-                          "ShowTab",
-                          &error,
-                          G_TYPE_STRING, id,
-                          G_TYPE_INVALID,
-                          G_TYPE_INVALID))
+  if (!bamf_dbus_browser__call_show_tab_sync (priv->proxy, id, NULL, &error))
     {
       g_warning ("Failed to show tab: %s", error->message);
       g_error_free (error);
     }
 }
 
-GArray *
+gchar *
 bamf_tab_source_get_tab_preview (BamfTabSource *self,
                                  char *id)
 {
   BamfTabSourcePrivate *priv;
   GError *error = NULL;
-  GArray *preview_data = NULL;
+  gchar *preview_data = NULL;
 
   g_return_val_if_fail (BAMF_IS_TAB_SOURCE (self), NULL);
   priv = self->priv;
 
-  if (!dbus_g_proxy_call (priv->proxy,
-                          "TabUri",
-                          &error,
-                          G_TYPE_STRING, id,
-                          G_TYPE_INVALID,
-                          G_TYPE_ARRAY, &preview_data,
-                          G_TYPE_INVALID))
+  if (!bamf_dbus_browser__call_tab_preview_sync (priv->proxy, id, &preview_data,
+                                                 NULL, &error))
     {
       g_warning ("Failed to get tab preview data: %s", error->message);
       g_error_free (error);
@@ -142,13 +126,7 @@
   g_return_val_if_fail (BAMF_IS_TAB_SOURCE (self), NULL);
   priv = self->priv;
 
-  if (!dbus_g_proxy_call (priv->proxy,
-                          "TabUri",
-                          &error,
-                          G_TYPE_STRING, id,
-                          G_TYPE_INVALID,
-                          G_TYPE_STRING, &uri,
-                          G_TYPE_INVALID))
+  if (!bamf_dbus_browser__call_tab_uri_sync (priv->proxy, id, &uri, NULL, &error))
     {
       g_warning ("Failed to get tab URI: %s", error->message);
       g_error_free (error);
@@ -169,13 +147,7 @@
   g_return_val_if_fail (BAMF_IS_TAB_SOURCE (self), 0);
   priv = self->priv;
 
-  if (!dbus_g_proxy_call (priv->proxy,
-                          "TabXid",
-                          &error,
-                          G_TYPE_STRING, id,
-                          G_TYPE_INVALID,
-                          G_TYPE_UINT, &xid,
-                          G_TYPE_INVALID))
+  if (!bamf_dbus_browser__call_tab_xid_sync (priv->proxy, id, &xid, NULL, &error))
     {
       g_warning ("Failed to get tab XID: %s", error->message);
       g_error_free (error);
@@ -186,7 +158,8 @@
 }
 
 static void
-bamf_tab_source_on_tab_opened (DBusGProxy *proxy, char *id, BamfTabSource *source)
+bamf_tab_source_on_tab_opened (BamfDBusBrowser *proxy, const char *id,
+                               BamfTabSource *source)
 {
   BamfTab *tab;
 
@@ -201,7 +174,8 @@
 }
 
 static void
-bamf_tab_source_on_tab_closed (DBusGProxy *proxy, char *id, BamfTabSource *source)
+bamf_tab_source_on_tab_closed (BamfDBusBrowser *proxy, const char *id,
+                               BamfTabSource *source)
 {
   BamfTab *tab;
 
@@ -221,7 +195,8 @@
 }
 
 static void
-bamf_tab_source_on_uri_changed (DBusGProxy *proxy, char *id, char *old_uri, char *new_uri, BamfTabSource *source)
+bamf_tab_source_on_uri_changed (BamfDBusBrowser *proxy, const char *id,
+                                const char *old_uri, char *new_uri, BamfTabSource *source)
 {
   g_signal_emit (source, REMOTE_TAB_URI_CHANGED, 0, id, old_uri, new_uri);
 }
@@ -266,13 +241,82 @@
     }
 }
 
+static void bamf_tab_source_reconnect (GObject *object, GParamSpec *pspec, BamfTabSource *self);
+
+static void
+on_proxy_ready_cb (GDBusProxy *proxy, GAsyncResult *res, BamfTabSource *self)
+{
+  BamfDBusBrowser *bproxy;
+  GError *error = NULL;
+  g_return_if_fail (BAMF_IS_TAB_SOURCE (self));
+
+  bproxy = bamf_dbus_browser__proxy_new_for_bus_finish (res, &error);
+
+  if (error)
+    {
+      g_critical ("Unable to get org.ayatana.bamf.browser object from bus %s: %s",
+                  self->priv->bus, error->message);
+      g_error_free (error);
+    }
+  else
+    {
+      gchar *owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (bproxy));
+
+      if (owner)
+        {
+          g_free (owner);
+
+          if (self->priv->proxy)
+            g_object_unref (self->priv->proxy);
+
+          self->priv->proxy = bproxy;
+
+          g_signal_connect (self->priv->proxy, "tab-uri-changed",
+                            (GCallback) bamf_tab_source_on_uri_changed, self);
+
+          g_signal_connect (self->priv->proxy, "tab-opened",
+                            (GCallback) bamf_tab_source_on_tab_opened, self);
+
+          g_signal_connect (self->priv->proxy, "tab-closed",
+                            (GCallback) bamf_tab_source_on_tab_closed, self);
+
+          g_signal_connect (self->priv->proxy, "notify::g-name-owner",
+                            G_CALLBACK (bamf_tab_source_reconnect), self);
+
+        }
+      else
+        {
+           g_debug ("Failed to get notification approver proxy: no owner available");
+           g_object_unref (proxy);
+        }
+    }
+}
+
+static void
+bamf_tab_source_reconnect (GObject *object, GParamSpec *pspec, BamfTabSource *self)
+{
+  g_return_if_fail (BAMF_IS_TAB_SOURCE (self));
+
+  if (self->priv->proxy)
+    {
+      g_object_unref (self->priv->proxy);
+      self->priv->proxy = NULL;
+    }
+
+  bamf_dbus_browser__proxy_new_for_bus (G_BUS_TYPE_SESSION,
+                                        G_DBUS_PROXY_FLAGS_NONE,
+                                        self->priv->bus,
+                                        self->priv->path,
+                                        NULL,
+                                        (GAsyncReadyCallback) on_proxy_ready_cb,
+                                        self);
+}
+
 static void
 bamf_tab_source_constructed (GObject *object)
 {
   BamfTabSource *source;
   BamfTabSourcePrivate *priv;
-  DBusGConnection *connection;
-  GError *error = NULL;
 
   if (G_OBJECT_CLASS (bamf_tab_source_parent_class)->constructed)
     G_OBJECT_CLASS (bamf_tab_source_parent_class)->constructed (object);
@@ -280,65 +324,40 @@
   source = BAMF_TAB_SOURCE (object);
   priv = source->priv;
 
-  connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-  if (connection == NULL)
-    {
-      g_critical ("Failed to open connection to bus: %s",
-               error != NULL ? error->message : "Unknown");
-      if (error)
-        g_error_free (error);
-      return;
-    }
-
-  priv->proxy = dbus_g_proxy_new_for_name (connection,
-                                           priv->bus,
-                                           priv->path,
-                                           "org.ayatana.bamf.browser");
-
-  if (priv->proxy == NULL)
-    {
-      g_critical ("Unable to get org.ayatana.bamf.browser object from bus");
-    }
-
-  dbus_g_proxy_add_signal (priv->proxy,
-                           "TabUriChanged",
-                           G_TYPE_STRING,
-                           G_TYPE_STRING,
-                           G_TYPE_STRING,
-                           G_TYPE_INVALID);
-
-  dbus_g_proxy_add_signal (priv->proxy,
-                           "TabOpened",
-                           G_TYPE_STRING,
-                           G_TYPE_INVALID);
-
-  dbus_g_proxy_add_signal (priv->proxy,
-                           "TabClosed",
-                           G_TYPE_STRING,
-                           G_TYPE_INVALID);
-
-  dbus_g_proxy_connect_signal (priv->proxy,
-                               "TabUriChanged",
-                               (GCallback) bamf_tab_source_on_uri_changed,
-                               source,
-                               NULL);
-
-  dbus_g_proxy_connect_signal (priv->proxy,
-                               "TabOpened",
-                               (GCallback) bamf_tab_source_on_tab_opened,
-                               source,
-                               NULL);
-
-  dbus_g_proxy_connect_signal (priv->proxy,
-                               "TabClosed",
-                               (GCallback) bamf_tab_source_on_tab_closed,
-                               source,
-                               NULL);
+  bamf_dbus_browser__proxy_new_for_bus (G_BUS_TYPE_SESSION,
+                                        G_DBUS_PROXY_FLAGS_NONE,
+                                        priv->bus,
+                                        priv->path,
+                                        NULL,
+                                        (GAsyncReadyCallback) on_proxy_ready_cb,
+                                        source);
 }
 
 static void
 bamf_tab_source_dispose (GObject *object)
 {
+  BamfTabSource *self;
+
+  self = BAMF_TAB_SOURCE (object);
+
+  if (self->priv->bus)
+    {
+      g_free (self->priv->bus);
+      self->priv->bus = NULL;
+    }
+
+  if (self->priv->path)
+    {
+      g_free (self->priv->path);
+      self->priv->path = NULL;
+    }
+
+  if (self->priv->proxy)
+    {
+      g_object_unref (self->priv->proxy);
+      self->priv->proxy = NULL;
+    }
+
   G_OBJECT_CLASS (bamf_tab_source_parent_class)->dispose (object);
 }
 
@@ -374,54 +393,54 @@
   g_object_class_install_property (object_class, PROP_BUS, pspec);
 
   bamf_tab_source_signals [REMOTE_TAB_URI_CHANGED] =
-  	g_signal_new ("remote-tab-uri-changed",
-  	              G_OBJECT_CLASS_TYPE (klass),
-  	              G_SIGNAL_RUN_FIRST,
-  	              0,
-  	              NULL, NULL,
-  	              bamf_marshal_VOID__STRING_STRING_STRING,
-  	              G_TYPE_NONE, 3,
-  	              G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+    g_signal_new ("remote-tab-uri-changed",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL, NULL,
+                  bamf_marshal_VOID__STRING_STRING_STRING,
+                  G_TYPE_NONE, 3,
+                  G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
   bamf_tab_source_signals [REMOTE_TAB_OPENED] =
-  	g_signal_new ("remote-tab-opened",
-  	              G_OBJECT_CLASS_TYPE (klass),
-  	              G_SIGNAL_RUN_FIRST,
-  	              0,
-  	              NULL, NULL,
-  	              g_cclosure_marshal_VOID__STRING,
-  	              G_TYPE_NONE, 1,
-  	              G_TYPE_STRING);
+    g_signal_new ("remote-tab-opened",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
 
   bamf_tab_source_signals [REMOTE_TAB_CLOSED] =
-  	g_signal_new ("remote-tab-closed",
-  	              G_OBJECT_CLASS_TYPE (klass),
-  	              G_SIGNAL_RUN_FIRST,
-  	              0,
-  	              NULL, NULL,
-  	              g_cclosure_marshal_VOID__STRING,
-  	              G_TYPE_NONE, 1,
-  	              G_TYPE_STRING);
+    g_signal_new ("remote-tab-closed",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
 
   bamf_tab_source_signals [TAB_OPENED] =
-  	g_signal_new ("tab-opened",
-  	              G_OBJECT_CLASS_TYPE (klass),
-  	              G_SIGNAL_RUN_FIRST,
-  	              0,
-  	              NULL, NULL,
-  	              g_cclosure_marshal_VOID__OBJECT,
-  	              G_TYPE_NONE, 1,
-  	              BAMF_TYPE_TAB);
+    g_signal_new ("tab-opened",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  BAMF_TYPE_TAB);
 
   bamf_tab_source_signals [TAB_CLOSED] =
-  	g_signal_new ("tab-closed",
-  	              G_OBJECT_CLASS_TYPE (klass),
-  	              G_SIGNAL_RUN_FIRST,
-  	              0,
-  	              NULL, NULL,
-  	              g_cclosure_marshal_VOID__OBJECT,
-  	              G_TYPE_NONE, 1,
-  	              BAMF_TYPE_TAB);
+    g_signal_new ("tab-closed",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  BAMF_TYPE_TAB);
 }
 
 BamfTabSource *
 
=== modified file 'src/bamf-tab-source.h'
--- src/bamf-tab-source.h	2010-05-25 13:47:38 +0000
+++ src/bamf-tab-source.h	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
@@ -59,7 +60,7 @@
 
 void            bamf_tab_source_show_tab         (BamfTabSource *self, char *id);
 
-GArray        * bamf_tab_source_get_tab_preview  (BamfTabSource *self, char *id);
+gchar         * bamf_tab_source_get_tab_preview  (BamfTabSource *self, char *id);
 
 char          * bamf_tab_source_get_tab_uri      (BamfTabSource *self, char *id);
 
 
=== modified file 'src/bamf-tab.c'
--- src/bamf-tab.c	2011-08-01 23:25:01 +0000
+++ src/bamf-tab.c	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -14,24 +14,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
 #include "bamf-tab.h"
-#include "bamf-tab-glue.h"
 #include "bamf-tab-source.h"
-#include "bamf-marshal.h"
 
-G_DEFINE_TYPE (BamfTab, bamf_tab, BAMF_TYPE_VIEW);
 #define BAMF_TAB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
 BAMF_TYPE_TAB, BamfTabPrivate))
 
-enum
-{
-  URI_CHANGED,
-
-  LAST_SIGNAL,
-};
+static void bamf_tab_dbus_iface_init (BamfDBusItemTabIface *iface);
+G_DEFINE_TYPE_WITH_CODE (BamfTab, bamf_tab, BAMF_TYPE_VIEW,
+                         G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_TAB,
+                                                bamf_tab_dbus_iface_init));
 
 enum
 {
@@ -41,10 +37,9 @@
   PROP_SOURCE,
 };
 
-static guint tab_signals[LAST_SIGNAL] = { 0 };
-
 struct _BamfTabPrivate
 {
+  BamfDBusItemTab *dbus_iface;
   char *id;
   char *uri;
   BamfTabSource *source;
@@ -73,20 +68,21 @@
   return bamf_tab_source_get_tab_xid (tab->priv->source, tab->priv->id);
 }
 
-GArray *
+gchar *
 bamf_tab_get_preview (BamfTab *tab)
 {
   return bamf_tab_source_get_tab_preview (tab->priv->source, tab->priv->id);
 }
 
-static char *
+static const char *
 bamf_tab_get_view_type (BamfView *view)
 {
-  return g_strdup ("tab");
+  return "tab";
 }
 
 static void
-on_tab_uri_changed (BamfTabSource *source, char *id, char *old_uri, char *new_uri, BamfTab *self)
+on_tab_source_uri_changed (BamfTabSource *source, char *id,
+                           char *old_uri, char *new_uri, BamfTab *self)
 {
   if (g_strcmp0 (id, self->priv->id) != 0)
     return;
@@ -94,7 +90,70 @@
   g_free (self->priv->uri);
   self->priv->uri = g_strdup (new_uri);
 
-  g_signal_emit (self, URI_CHANGED, 0, old_uri, new_uri);
+  g_signal_emit_by_name (self, "uri-changed", old_uri, new_uri);
+}
+
+static void
+on_uri_changed (BamfTab *self, const gchar *old_uri, const gchar *new_uri, gpointer _not_used)
+{
+  g_return_if_fail (BAMF_IS_TAB (self));
+  g_signal_emit_by_name (self->priv->dbus_iface, "uri-changed", old_uri, new_uri);
+}
+
+static gboolean
+on_dbus_handle_show_tab (BamfDBusItemTab *interface,
+                         GDBusMethodInvocation *invocation,
+                         BamfTab *self)
+{
+  bamf_tab_show (self);
+  g_dbus_method_invocation_return_value (invocation, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_parent_xid (BamfDBusItemTab *interface,
+                           GDBusMethodInvocation *invocation,
+                           BamfTab *self)
+{
+  guint32 parent_xid = bamf_tab_parent_xid (self);
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(u)", parent_xid));
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_current_uri (BamfDBusItemTab *interface,
+                            GDBusMethodInvocation *invocation,
+                            BamfTab *self)
+{
+  char *current_uri = self->priv->uri ? self->priv->uri : "";
+  g_dbus_method_invocation_return_value (invocation,
+                                         g_variant_new ("(s)", current_uri));
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_preview (BamfDBusItemTab *interface,
+                        GDBusMethodInvocation *invocation,
+                        BamfTab *self)
+{
+  gchar *preview = bamf_tab_get_preview (self);
+
+  if (preview)
+    {
+      bamf_dbus_item_tab_complete_preview (interface, invocation, preview);
+      g_free (preview);
+    }
+  else
+    {
+      g_dbus_method_invocation_return_value (invocation,
+                                             g_variant_new ("(ay)", NULL));
+    }
+
+  return TRUE;
 }
 
 static void
@@ -151,19 +210,72 @@
 
   self = BAMF_TAB (object);
 
-  g_signal_connect (self->priv->source, "remote-tab-uri-changed", (GCallback) on_tab_uri_changed, self);
+  g_signal_connect (self->priv->source, "remote-tab-uri-changed",
+                    G_CALLBACK (on_tab_source_uri_changed), self);
 }
 
 static void
 bamf_tab_dispose (GObject *object)
 {
+  BamfTab *self = BAMF_TAB (object);
+
+  if (self->priv->id)
+    {
+      g_free (self->priv->id);
+      self->priv->id = NULL;
+    }
+
+  if (self->priv->uri)
+    {
+      g_free (self->priv->uri);
+      self->priv->uri = NULL;
+    }
+
   G_OBJECT_CLASS (bamf_tab_parent_class)->dispose (object);
 }
 
 static void
+bamf_tab_finalize (GObject *object)
+{
+  BamfTab *self = BAMF_TAB (object);
+
+  g_object_unref (self->priv->dbus_iface);
+
+  G_OBJECT_CLASS (bamf_tab_parent_class)->finalize (object);
+}
+
+static void
 bamf_tab_init (BamfTab * self)
 {
   self->priv = BAMF_TAB_GET_PRIVATE (self);
+
+  /* Initializing the dbus interface */
+  self->priv->dbus_iface = bamf_dbus_item_tab_skeleton_new ();
+
+  /* We need to connect to the object own signals to redirect them to the dbus
+   * interface                                                                */
+  g_signal_connect (self, "uri-changed", G_CALLBACK (on_uri_changed), NULL);
+
+  /* Registering signal callbacks to reply to dbus method calls */
+  g_signal_connect (self->priv->dbus_iface, "handle-show-tab",
+                    G_CALLBACK (on_dbus_handle_show_tab), self);
+
+  g_signal_connect (self->priv->dbus_iface, "handle-parent-xid",
+                    G_CALLBACK (on_dbus_handle_parent_xid), self);
+
+  g_signal_connect (self->priv->dbus_iface, "handle-current-uri",
+                    G_CALLBACK (on_dbus_handle_current_uri), self);
+
+  g_signal_connect (self->priv->dbus_iface, "handle-preview",
+                    G_CALLBACK (on_dbus_handle_preview), self);
+
+  /* Setting the interface for the dbus object */
+  bamf_dbus_item_object_skeleton_set_tab (BAMF_DBUS_ITEM_OBJECT_SKELETON (self),
+                                          self->priv->dbus_iface);
+}
+
+static void bamf_tab_dbus_iface_init (BamfDBusItemTabIface *iface)
+{
 }
 
 static void
@@ -177,6 +289,7 @@
   object_class->get_property = bamf_tab_get_property;
   object_class->set_property = bamf_tab_set_property;
   object_class->dispose      = bamf_tab_dispose;
+  object_class->finalize     = bamf_tab_finalize;
   view_class->view_type      = bamf_tab_get_view_type;
 
   pspec = g_param_spec_string ("id", "id", "id", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
@@ -186,22 +299,10 @@
   g_object_class_install_property (object_class, PROP_SOURCE, pspec);
 
   g_type_class_add_private (klass, sizeof (BamfTabPrivate));
-
-  dbus_g_object_type_install_info (BAMF_TYPE_TAB,
-				   &dbus_glib_bamf_tab_object_info);
-
-  tab_signals [URI_CHANGED] =
-  	g_signal_new ("uri-changed",
-  	              G_OBJECT_CLASS_TYPE (klass),
-  	              0,
-  	              0, NULL, NULL,
-  	              bamf_marshal_VOID__STRING_STRING,
-  	              G_TYPE_NONE, 2,
-  	              G_TYPE_STRING, G_TYPE_STRING);
 }
 
 BamfTab *
-bamf_tab_new (BamfTabSource *source, char *id)
+bamf_tab_new (BamfTabSource *source, const char *id)
 {
   BamfTab *self;
   self = (BamfTab *) g_object_new (BAMF_TYPE_TAB,
 
=== modified file 'src/bamf-tab.h'
--- src/bamf-tab.h	2010-05-25 13:47:38 +0000
+++ src/bamf-tab.h	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
@@ -58,8 +59,8 @@
 
 guint32     bamf_tab_parent_xid  (BamfTab *tab);
 
-GArray    * bamf_tab_get_preview (BamfTab *tab);
+gchar     * bamf_tab_get_preview (BamfTab *tab);
 
-BamfTab   * bamf_tab_new         (BamfTabSource *source, char *tab_id);
+BamfTab   * bamf_tab_new         (BamfTabSource *source, const char *tab_id);
 
 #endif
 
=== removed file 'src/bamf-view-glue.xml'
--- src/bamf-view-glue.xml	2011-01-26 09:54:11 +0000
+++ src/bamf-view-glue.xml	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/org/ayatana/bamf">
-
-	<interface name="org.ayatana.bamf.view">
-	
-		<signal name="ActiveChanged">
-			<arg type="b" name="new_state" direction="out" />
-		</signal>
-
-		<signal name="Closed">
-		</signal>
-
-		<signal name="ChildAdded">
-			<arg type="s" name="path" direction="out" />
-		</signal>
-
-		<signal name="ChildRemoved">
-			<arg type="s" name="path" direction="out" />
-		</signal>
-
-		<signal name="RunningChanged">
-			<arg type="b" name="new_state" direction="out" />
-		</signal>
-		
-		<signal name="UrgentChanged">
-			<arg type="b" name="new_state" direction="out" />
-		</signal>
-		
-		<signal name="UserVisibleChanged">
-			<arg type="b" name="new_state" direction="out" />
-		</signal>
-
-		<signal name="NameChanged">
-			<arg type="s" name="old_name" direction="out" />
-			<arg type="s" name="new_name" direction="out" />
-		</signal>
-		
-		<property name="Active" type="b" access="read" />
-		<property name="Urgent" type="b" access="read" />
-		<property name="Running" type="b" access="read" />
-		<property name="UserVisible" type="b" access="read" />
-
-		<method name="Children">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_view_get_children_paths" />
-			<arg type="as" name="children" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-		<method name="Parents">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_view_get_parent_paths" />
-			<arg type="as" name="parents" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="IsActive">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_view_is_active" />
-			<arg type="b" name="active" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="IsRunning">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_view_is_running" />
-			<arg type="b" name="running" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-		<method name="IsUrgent">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_view_is_urgent" />
-			<arg type="b" name="urgent" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="Name">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_view_get_name" />
-			<arg type="s" name="name" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-		<method name="Icon">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_view_get_icon" />
-			<arg type="s" name="name" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-		<method name="UserVisible">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_view_user_visible" />
-			<arg type="b" name="visible" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-
-		<method name="ViewType">
-			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="bamf_view_get_view_type" />
-			<arg type="s" name="view_type" direction="out">
-				<annotation name="org.freedesktop.DBus.GLib.ReturnVal" value=""/>
-			</arg>
-		</method>
-		
-	</interface>
-	
-</node>
 
=== modified file 'src/bamf-view.c'
--- src/bamf-view.c	2011-12-14 03:19:47 +0000
+++ src/bamf-view.c	2012-01-19 19:16:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2011 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
@@ -14,21 +14,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
-#include "bamf-marshal.h"
 #include "bamf-view.h"
-#include "bamf-view-glue.h"
 
-G_DEFINE_TYPE (BamfView, bamf_view, G_TYPE_OBJECT);
 #define BAMF_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
-BAMF_TYPE_VIEW, BamfViewPrivate))
+                                    BAMF_TYPE_VIEW, BamfViewPrivate))
+
+static void bamf_view_dbus_view_iface_init (BamfDBusItemViewIface *iface);
+G_DEFINE_TYPE_WITH_CODE (BamfView, bamf_view, BAMF_DBUS_ITEM_TYPE_OBJECT_SKELETON,
+                         G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_VIEW,
+                                                bamf_view_dbus_view_iface_init));
 
 enum
 {
   PROP_0,
-  
+
   PROP_ACTIVE,
   PROP_RUNNING,
   PROP_URGENT,
@@ -37,16 +40,8 @@
 
 enum
 {
-  ACTIVE_CHANGED,
-  CLOSED,
   CLOSED_INTERNAL,
-  CHILD_ADDED,
-  CHILD_REMOVED,
   EXPORTED,
-  RUNNING_CHANGED,
-  URGENT_CHANGED,
-  USER_VISIBLE_CHANGED,
-  NAME_CHANGED,
 
   LAST_SIGNAL,
 };
@@ -55,20 +50,19 @@
 
 struct _BamfViewPrivate
 {
+  BamfDBusItemView *dbus_iface;
   char * name;
   char * path;
   GList * children;
   GList * parents;
   gboolean closed;
-  gboolean is_active;
-  gboolean is_running;
-  gboolean is_urgent;
-  gboolean user_visible;
 };
 
 static void
 bamf_view_active_changed (BamfView *view, gboolean active)
 {
+  g_return_if_fail (BAMF_IS_VIEW (view));
+
   gboolean emit = TRUE;
   if (BAMF_VIEW_GET_CLASS (view)->active_changed)
     {
@@ -76,16 +70,17 @@
     }
 
   if (emit)
-    g_signal_emit (view, view_signals[ACTIVE_CHANGED], 0, active);
-
+    g_signal_emit_by_name (view, "active-changed", active);
 }
 
 static void
-bamf_view_name_changed (BamfView*    view,
-                        const gchar* old_name,
-                        const gchar* new_name)
+bamf_view_name_changed (BamfView *view,
+                        const gchar *old_name,
+                        const gchar *new_name)
 {
-  g_signal_emit (view, view_signals[NAME_CHANGED], 0, old_name, new_name);
+  g_return_if_fail (BAMF_IS_VIEW (view));
+
+  g_signal_emit_by_name (view, "name-changed", old_name, new_name);
 
   if (view->priv->name)
     g_free (view->priv->name);
@@ -96,6 +91,8 @@
 static void
 bamf_view_user_visible_changed (BamfView *view, gboolean user_visible)
 {
+  g_return_if_fail (BAMF_IS_VIEW (view));
+
   gboolean emit = TRUE;
   if (BAMF_VIEW_GET_CLASS (view)->user_visible_changed)
     {
@@ -103,12 +100,14 @@
     }
 
   if (emit)
-    g_signal_emit (view, view_signals[USER_VISIBLE_CHANGED], 0, user_visible);
+    g_signal_emit_by_name (view, "user-visible-changed", user_visible);
 }
 
 static void
 bamf_view_running_changed (BamfView *view, gboolean running)
 {
+  g_return_if_fail (BAMF_IS_VIEW (view));
+
   gboolean emit = TRUE;
   if (BAMF_VIEW_GET_CLASS (view)->running_changed)
     {
@@ -116,12 +115,14 @@
     }
 
   if (emit)
-    g_signal_emit (view, view_signals[RUNNING_CHANGED], 0, running);
+    g_signal_emit_by_name (view, "running-changed", running);
 }
 
 static void
 bamf_view_urgent_changed (BamfView *view, gboolean urgent)
 {
+  g_return_if_fail (BAMF_IS_VIEW (view));
+
   gboolean emit = TRUE;
   if (BAMF_VIEW_GET_CLASS (view)->urgent_changed)
     {
@@ -129,7 +130,7 @@
     }
 
   if (emit)
-    g_signal_emit (view, view_signals[URGENT_CHANGED], 0, urgent);
+    g_signal_emit_by_name (view, "urgent-changed", urgent);
 }
 
 void
@@ -138,19 +139,20 @@
   BamfViewPrivate *priv;
   gboolean emit = TRUE;
   GList *l;
-  
+
+  g_return_if_fail (BAMF_IS_VIEW (view));
   priv = view->priv;
 
   if (priv->closed)
     return;
-    
+
   priv->closed = TRUE;
 
   if (BAMF_VIEW_GET_CLASS (view)->closed)
     {
       emit = !BAMF_VIEW_GET_CLASS (view)->closed (view);
     }
-  
+
   if (priv->children)
     {
       for (l = priv->children; l; l = l->next)
@@ -164,10 +166,10 @@
 
   if (emit)
     {
-      g_object_ref (G_OBJECT (view));
+      g_object_ref (view);
       g_signal_emit (view, view_signals[CLOSED_INTERNAL], 0);
-      g_signal_emit (view, view_signals[CLOSED], 0);
-      g_object_unref (G_OBJECT (view));
+      g_signal_emit_by_name (view, "closed");
+      g_object_unref (view);
     }
 }
 
@@ -179,35 +181,31 @@
   return view->priv->path;
 }
 
-char **
+GVariant *
 bamf_view_get_children_paths (BamfView *view)
 {
-  char ** paths;
-  const char *path;
-  int n_items, i;
-  GList *child;
-  BamfView *cview;
+  GVariantBuilder b;
+  GList *l;
 
   g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
 
-  n_items = g_list_length (view->priv->children);
-
-  paths = g_malloc0 (sizeof (char *) * (n_items + 1));
-
-  i = 0;
-  for (child = view->priv->children; child; child = child->next)
+  g_variant_builder_init (&b, G_VARIANT_TYPE ("(as)"));
+  g_variant_builder_open (&b, G_VARIANT_TYPE ("as"));
+
+  for (l = view->priv->children; l; l = l->next)
     {
-      cview = child->data;
-      path = bamf_view_get_path (cview);
+      BamfView *child = l->data;
+      const char *path = bamf_view_get_path (child);
 
       if (!path)
         continue;
 
-      paths[i] = g_strdup (path);
-      i++;
+      g_variant_builder_add (&b, "s", path);
     }
 
-  return paths;
+  g_variant_builder_close (&b);
+
+  return g_variant_builder_end (&b);
 }
 
 GList *
@@ -218,35 +216,31 @@
   return view->priv->children;
 }
 
-char **
+GVariant *
 bamf_view_get_parent_paths (BamfView *view)
 {
-  char ** paths;
-  const char *path;
-  int n_items, i;
-  GList *parent;
-  BamfView *pview;
+  GVariantBuilder b;
+  GList *l;
 
   g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
 
-  n_items = g_list_length (view->priv->parents);
-
-  paths = g_malloc0 (sizeof (char *) * (n_items + 1));
-
-  i = 0;
-  for (parent = view->priv->parents; parent; parent = parent->next)
+  g_variant_builder_init (&b, G_VARIANT_TYPE ("(as)"));
+  g_variant_builder_open (&b, G_VARIANT_TYPE ("as"));
+
+  for (l = view->priv->parents; l; l = l->next)
     {
-      pview = parent->data;
-      path = bamf_view_get_path (pview);
+      BamfView *parent = l->data;
+      const char *path = bamf_view_get_path (parent);
 
       if (!path)
         continue;
 
-      paths[i] = g_strdup (path);
-      i++;
+      g_variant_builder_add (&b, "s", path);
     }
 
-  return paths;
+  g_variant_builder_close (&b);
+
+  return g_variant_builder_end (&b);
 }
 
 GList *
@@ -274,7 +268,7 @@
   g_return_if_fail (BAMF_IS_VIEW (child));
 
   g_signal_connect (G_OBJECT (child), "closed-internal",
-		    (GCallback) bamf_view_handle_child_closed, view);
+                    (GCallback) bamf_view_handle_child_closed, view);
 
   /* Make sure our parent child lists are ok, pay attention to whose list you add parents to */
   view->priv->children = g_list_prepend (view->priv->children, child);
@@ -285,7 +279,7 @@
     BAMF_VIEW_GET_CLASS (view)->child_added (view, child);
 
   added = bamf_view_get_path (child);
-  g_signal_emit (view, view_signals[CHILD_ADDED], 0, added);
+  g_signal_emit_by_name (view, "child-added", added);
 }
 
 void
@@ -303,12 +297,12 @@
   view->priv->children = g_list_remove (view->priv->children, child);
   child->priv->parents = g_list_remove (child->priv->parents, view);
 
+  removed = bamf_view_get_path (child);
+  g_signal_emit_by_name (view, "child-removed", removed);
+
   // Do this by hand so we can pass and object instead of a string
   if (BAMF_VIEW_GET_CLASS (view)->child_removed)
     BAMF_VIEW_GET_CLASS (view)->child_removed (view, child);
-
-  removed = bamf_view_get_path (child);
-  g_signal_emit (view, view_signals[CHILD_REMOVED], 0, removed);
 }
 
 gboolean
@@ -316,7 +310,7 @@
 {
   g_return_val_if_fail (BAMF_IS_VIEW (view), FALSE);
 
-  return view->priv->is_active;
+  return bamf_dbus_item_view_get_active (view->priv->dbus_iface);
 }
 
 void
@@ -325,10 +319,10 @@
 {
   g_return_if_fail (BAMF_IS_VIEW (view));
 
-  if (active == view->priv->is_active)
+  if (active == bamf_view_is_active (view))
     return;
 
-  view->priv->is_active = active;
+  bamf_dbus_item_view_set_active (view->priv->dbus_iface, active);
   bamf_view_active_changed (view, active);
 }
 
@@ -337,7 +331,7 @@
 {
   g_return_val_if_fail (BAMF_IS_VIEW (view), FALSE);
 
-  return view->priv->is_urgent;
+  return bamf_dbus_item_view_get_urgent (view->priv->dbus_iface);
 }
 
 void
@@ -346,10 +340,10 @@
 {
   g_return_if_fail (BAMF_IS_VIEW (view));
 
-  if (urgent == view->priv->is_urgent)
+  if (urgent == bamf_view_is_urgent (view))
     return;
 
-  view->priv->is_urgent = urgent;
+  bamf_dbus_item_view_set_urgent (view->priv->dbus_iface, urgent);
   bamf_view_urgent_changed (view, urgent);
 }
 
@@ -358,7 +352,7 @@
 {
   g_return_val_if_fail (BAMF_IS_VIEW (view), FALSE);
 
-  return view->priv->is_running;
+  return bamf_dbus_item_view_get_running (view->priv->dbus_iface);
 }
 
 void
@@ -367,10 +361,10 @@
 {
   g_return_if_fail (BAMF_IS_VIEW (view));
 
-  if (running == view->priv->is_running)
+  if (running == bamf_view_is_running (view))
     return;
 
-  view->priv->is_running = running;
+  bamf_dbus_item_view_set_running (view->priv->dbus_iface, running);
   bamf_view_running_changed (view, running);
 }
 
@@ -379,7 +373,7 @@
 {
   g_return_val_if_fail (BAMF_IS_VIEW (view), FALSE);
 
-  return view->priv->user_visible;
+  return bamf_dbus_item_view_get_user_visible (view->priv->dbus_iface);
 }
 
 void
@@ -387,10 +381,10 @@
 {
   g_return_if_fail (BAMF_IS_VIEW (view));
 
-  if (user_visible == view->priv->user_visible)
+  if (user_visible == bamf_view_user_visible (view))
     return;
 
-  view->priv->user_visible = user_visible;
+  bamf_dbus_item_view_set_user_visible (view->priv->dbus_iface, user_visible);
   bamf_view_user_visible_changed (view, user_visible);
 }
 
@@ -422,10 +416,10 @@
   if (!g_strcmp0 (name, view->priv->name))
     return;
 
-  bamf_view_name_changed (view, view->priv->name, (gchar*) name);
+  bamf_view_name_changed (view, view->priv->name, name);
 }
 
-char *
+const char *
 bamf_view_get_view_type (BamfView *view)
 {
   g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
@@ -433,7 +427,7 @@
   if (BAMF_VIEW_GET_CLASS (view)->view_type)
     return BAMF_VIEW_GET_CLASS (view)->view_type (view);
 
-  return g_strdup ("view");
+  return "view";
 }
 
 char *
@@ -447,14 +441,15 @@
   return g_strdup_printf ("view%p", view);
 }
 
-char *
-bamf_view_export_on_bus (BamfView *view)
+const char *