bigboard r7238 - trunk/bigboard

[otaylor svn gnome org]

Author: otaylor
Date: Sun Jan 27 20:29:35 2008
New Revision: 7238
URL: http://svn.gnome.org/viewvc/bigboard?rev=7238&view=rev

Log:
Use the engine name, not the stacker name when we need the engine.


Modified:
   trunk/bigboard/global_mugshot.py
   trunk/bigboard/globals.py

Modified: trunk/bigboard/global_mugshot.py
==============================================================================
--- trunk/bigboard/global_mugshot.py	(original)
+++ trunk/bigboard/global_mugshot.py	Sun Jan 27 20:29:35 2008
@@ -45,13 +45,12 @@
          try:        
              bus = dbus.SessionBus()
              self._logger.debug("creating proxy for %s" % globals.bus_name)
-             self.__proxy = bus.get_object(globals.bus_name, '/org/mugshot/Mugshot')
-             self.__mugshot_dbus_proxy = bus.get_object(globals.bus_name, '/com/dumbhippo/client')             
+             self.__mugshot_dbus_proxy = bus.get_object(globals.bus_name, '/com/dumbhippo/client')
              self.__mugshot_dbus_proxy.RegisterEndpoint(reply_handler=self.__on_register_endpoint, error_handler=self.__on_dbus_error)
             
          except dbus.DBusException, e:
              _logger.debug("Caught D-BUS exception while trying to create proxy", exc_info=True)
-             self.__proxy = None
+             self.__mugshot_dbus_proxy = None
 
     def __create_ws_proxy(self):
          try:
@@ -67,7 +66,7 @@
                 self._logger.debug("owner for %s changed, recreating proxies", globals.bus_name)
                 self.__create_proxy()
             else:
-                self.__proxy = None
+                self.__mugshot_dbus_proxy = None
                 self.__ws_proxy = None
 
     @log_except(_logger)

Modified: trunk/bigboard/globals.py
==============================================================================
--- trunk/bigboard/globals.py	(original)
+++ trunk/bigboard/globals.py	Sun Jan 27 20:29:35 2008
@@ -18,17 +18,10 @@
     return re.sub(r"[^a-zA-Z0-9]", _escape_byte, server_name.encode("UTF-8"))
 
 def _make_bus_name(server_name):
-
-    ## FIXME this is broken; in the new plan we use
-    ## com.dumbhippo.Client if we mean the stacker and
-    ## org.freedesktop.od.Engine if we mean Online Desktop Engine.
-    ## which means both the use of Mugshot and dumbhippo.Client
-    ## here are wrong.
-    
     if server_name == None:
-        return "org.mugshot.Mugshot";
+        return "org.freedesktop.od.Engine";
 
-    return "com.dumbhippo.Client." + _escape_server_name(server_name)
+    return "org.freedesktop.od.Engine." + _escape_server_name(server_name)
 
 def on_data_model_ready():
     global __the_data_model