From 77c9e62d64566f84c77d3f24e31500797cfbf192 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Fri, 20 Jun 2008 22:23:49 +0200
Subject: [PATCH] Modify the DBusManager to acquire
 org.gnome.MediaManager/Manager

---
 src/mm-dbus-manager.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/mm-dbus-manager.c b/src/mm-dbus-manager.c
index a90c8e5..615415b 100644
--- a/src/mm-dbus-manager.c
+++ b/src/mm-dbus-manager.c
@@ -69,37 +69,19 @@ mm_dbus_manager_class_init (MMDBusManagerClass *klass)
     dbus_g_object_type_install_info (MM_TYPE_DBUS_MANAGER,
                                      &dbus_glib_mm_dbus_manager_object_info);
   }
-  
+
   g_type_class_add_private (klass, sizeof (MMDBusManagerDetails));
 }
 
 static void
 register_on_the_bus (MMDBusManager *manager)
 {
-  GError *error = NULL;
-  DBusGProxy *driver_proxy;
-  guint request_ret;
   MMDBusManagerClass *klass = MM_DBUS_MANAGER_GET_CLASS (manager);
 
   /* register the object */
   dbus_g_connection_register_g_object (klass->connection,
-                                       "/org/gnome/MediaManager",
+                                       "/org/gnome/MediaManager/Manager",
                                        G_OBJECT (manager));
-  /* register the service name */
-  driver_proxy = dbus_g_proxy_new_for_name (klass->connection,
-                                            DBUS_SERVICE_DBUS,
-                                            DBUS_PATH_DBUS,
-                                            DBUS_INTERFACE_DBUS);
-  if (!org_freedesktop_DBus_request_name (driver_proxy,
-                                          "org.gnome.MediaManager",
-                                          DBUS_NAME_FLAG_DO_NOT_QUEUE,
-                                          &request_ret,
-                                          &error)) {
-    g_warning ("RequestName failed: %s", error->message);
-    g_error_free (error);
-  }
-  
-  g_object_unref (driver_proxy);
 }
 
 static void
@@ -116,7 +98,10 @@ mm_dbus_manager_init (MMDBusManager *manager)
 gboolean
 server_register_app (MMDBusManager *manager, char *path, GError **error)
 {
-  if (!path) {
+  g_return_val_if_fail (MM_IS_DBUS_MANAGER (manager), FALSE);
+
+  g_debug ("registrering app %s", path);
+  if (path == NULL) {
     /* set the error, the path can't be NULL */
     g_set_error (error, MM_DBUS_ERROR_QUARK,
                  MM_DBUS_ERROR_NULL_PATH,
-- 
2.11.4.GIT