2009-02-8 Mark Doffman <mark.doffman@codethink.co.uk>

        * droute/droute.c
          droute/droute.h
          Add two new convinience functions for out
          of memory and bad arguments D-Bus errors.

        * pyatspi/__init__.py
          Add a top level module 'Accessibility' to remain
          compatible with the CORBA pyatspi.

diff --git a/droute/droute.c b/droute/droute.c
index 06ec2bd..3b4d9e3 100644 (file)
--- a/droute/droute.c
+++ b/droute/droute.c
@@ -541,4 +541,40 @@ droute_not_yet_handled_error (DBusMessage *message)
     return reply;
 }
 
+DBusMessage *
+droute_out_of_memory_error (DBusMessage *message)
+{
+    DBusMessage *reply;
+    gchar       *errmsg;
+
+    errmsg= g_strdup_printf (
+            "Method \"%s\" with signature \"%s\" on interface \"%s\" could not be processed due to lack of memory\n",
+            dbus_message_get_member (message),
+            dbus_message_get_signature (message),
+            dbus_message_get_interface (message));
+    reply = dbus_message_new_error (message,
+                                    DBUS_ERROR_NO_MEMORY,
+                                    errmsg);
+    g_free (errmsg);
+    return reply;
+}
+
+DBusMessage *
+droute_invalid_arguments_error (DBusMessage *message)
+{
+    DBusMessage *reply;
+    gchar       *errmsg;
+
+    errmsg= g_strdup_printf (
+            "Method \"%s\" with signature \"%s\" on interface \"%s\" was supplied with invalid arguments\n",
+            dbus_message_get_member (message),
+            dbus_message_get_signature (message),
+            dbus_message_get_interface (message));
+    reply = dbus_message_new_error (message,
+                                    DBUS_ERROR_INVALID_ARGS,
+                                    errmsg);
+    g_free (errmsg);
+    return reply;
+}
+
 /*END------------------------------------------------------------------------*/

diff --git a/droute/droute.h b/droute/droute.h
index 3943178..a892c62 100644 (file)
--- a/droute/droute.h
+++ b/droute/droute.h
@@ -81,7 +81,13 @@ droute_path_add_interface (DRoutePath *path,
                            const DRouteProperty *properties);
 
 DBusMessage *
-droute_not_yet_handled_error (DBusMessage *message);
+droute_not_yet_handled_error   (DBusMessage *message);
+
+DBusMessage *
+droute_invalid_arguments_error (DBusMessage *message);
+
+DBusMessage *
+droute_out_of_memory_error     (DBusMessage *message);
 
 DBusConnection *
 droute_get_bus (DRouteContext *cnx);

diff --git a/pyatspi/__init__.py b/pyatspi/__init__.py
index 510e65b..3ad8476 100644 (file)
--- a/pyatspi/__init__.py
+++ b/pyatspi/__init__.py
@@ -21,3 +21,10 @@ del registry
 
 import constants
 from Accessibility import *
+
+#This is a re-creation of the namespace pollution implemented
+#by PyORBit.
+import sys
+import Accessibility
+sys.modules['Accessibility'] = Accessibility
+del sys