desktop-data-model r7243 - trunk/engine-dbus

[otaylor svn gnome org]

Author: otaylor
Date: Sun Jan 27 20:04:48 2008
New Revision: 7243
URL: http://svn.gnome.org/viewvc/desktop-data-model?rev=7243&view=rev

Log:
Don't acquire com.dumbhippo.Client, we're the engine, not the stacker!


Modified:
   trunk/engine-dbus/hippo-dbus-server.c

Modified: trunk/engine-dbus/hippo-dbus-server.c
==============================================================================
--- trunk/engine-dbus/hippo-dbus-server.c	(original)
+++ trunk/engine-dbus/hippo-dbus-server.c	Sun Jan 27 20:04:48 2008
@@ -257,7 +257,7 @@
 
 
     /* FIXME we should only get the Engine name here with the desktop server, not
-     * the stacker... that requires a little BigBoard fixage.
+     * the stacker server... that requires a little BigBoard fixage.
      */
     
     stacker_bus_name = hippo_dbus_full_bus_name(stacker_server);
@@ -301,27 +301,6 @@
        		g_debug("Acquired bus name %s", HIPPO_DBUS_ENGINE_BASE_BUS_NAME);       	
     }
 
-    {
-    	DBusError tmp_derror;    
-        dbus_uint32_t flags;
-        
-    	dbus_error_init(&tmp_derror);        
-        
-        /* We do want to be queued if we don't get this right away */
-        flags = DBUS_NAME_FLAG_ALLOW_REPLACEMENT;
-        if (replace_existing)
-            flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
-        
-        /* we just ignore errors on this */
-        dbus_bus_request_name(connection, HIPPO_DBUS_STACKER_BASE_BUS_NAME,
-                              flags,
-                              &tmp_derror);
-        if (dbus_error_is_set(&tmp_derror))
-        	g_debug("Failed to get bus name %s: %s", HIPPO_DBUS_STACKER_BASE_BUS_NAME, tmp_derror.message);
-       	else
-       		g_debug("Acquired bus name %s", HIPPO_DBUS_STACKER_BASE_BUS_NAME);                              
-    }
-    
     /* the connection is already set up with the main loop. 
      * We just need to create our object, filters, etc. 
      */