orca r3826 - in trunk: . src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Wed Apr  9 22:06:22 2008
New Revision: 3826
URL: http://svn.gnome.org/viewvc/orca?rev=3826&view=rev

Log:
Additional work for migration to a DBus server from an HTTP server.


Modified:
   trunk/ChangeLog
   trunk/src/orca/dbusserver.py
   trunk/src/orca/orca.in

Modified: trunk/src/orca/dbusserver.py
==============================================================================
--- trunk/src/orca/dbusserver.py	(original)
+++ trunk/src/orca/dbusserver.py	Wed Apr  9 22:06:22 2008
@@ -30,7 +30,6 @@
 import dbus.mainloop.glib
 
 import debug
-import platform
 import settings
 
 # Handlers for logging speech and braille output.
@@ -38,8 +37,14 @@
 loggingFileHandlers = {}
 loggingStreamHandlers = {}
 
+# pylint: disable-msg=R0923
+# Server: Interface not implemented
+
 class Server(dbus.service.Object):
 
+    def __init__(self, object_path, bus_name):
+        dbus.service.Object.__init__(self, None, object_path, bus_name)
+
     @dbus.service.method(dbus_interface='org.gnome.Orca.Logging',
                          in_signature='si', out_signature='')
     def setDebug(self, debugFile, debugLevel):
@@ -148,7 +153,7 @@
         dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
         bus = dbus.SessionBus()
         name = dbus.service.BusName('org.gnome.Orca', bus=bus)
-        obj = Server(name, '/')
+        obj = Server('/', name)
     except:
         debug.println(debug.LEVEL_WARNING,
                       "dbusserver.py: Could not initialize DBus server")

Modified: trunk/src/orca/orca.in
==============================================================================
--- trunk/src/orca/orca.in	(original)
+++ trunk/src/orca/orca.in	Wed Apr  9 22:06:22 2008
@@ -69,6 +69,8 @@
         }
     done
 fi
+# [[WDW - disabled the watchdog by default since it is problematic.]]
+WATCHDOG=0
 
 # Cleans up any orca-related processes that might be running,
 # restricting it to those processes owned by the user. These include
@@ -155,7 +157,7 @@
             then
                 exit
             else
-                $DBUSSENDCMD --reply-timeout=5000 --print-reply --dest=org.gnome.Orca / org.freedesktop.DBus.Peer.Ping > /dev/null 2>&1 
+                $DBUSSENDCMD --reply-timeout=30000 --print-reply --dest=org.gnome.Orca / org.freedesktop.DBus.Peer.Ping > /dev/null 2>&1 
                 if [ "$?" -ne 0 ] 
                 then
                     echo Orca watchdog detected something bad.  Cleaning up.