Merge revisions 36016:36303 from trunk.

svn path=/branches/kill-bonobo/; revision=36307

1 files changed, 16 insertions, 1 deletions

diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c
index 83bc8ac627..e03e009d13 100644
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@ -47,7 +47,7 @@ reinit_dbus (EShell *shell)
 
 static DBusHandlerResult
 e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED,
-			 DBusMessage *message, void *user_data)
+                         DBusMessage *message, void *user_data)
 {
 	DBusError error;
 	const gchar *object;
@@ -131,3 +131,18 @@ exception:
 
 	return FALSE;
 }
+
+gboolean
+e_shell_dbus_initialise (EShellWindow *window)
+{
+	g_type_init ();
+
+	return init_dbus (window);
+}
+
+void
+e_shell_dbus_dispose (EShellWindow *window)
+{
+	//FIXME
+	return;
+}