2008-10-13 Mark Doffman <mark.doffman@codethink.co.uk>

	* registryd/registry.c
	* registryd/testregistry.py
	Fix issues with wrong interface name in testregistry.py
	and bad pointer use in message marshalling. (registry.c)

diff --git a/registryd/registry.c b/registryd/registry.c
index 3423f92..b5610fe 100644 (file)
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -64,7 +64,7 @@ add_bus_name_cb (gpointer item, gpointer data)
 {
   DBusMessageIter *iter_array = (DBusMessageIter *) data;
 
-  dbus_message_iter_append_basic (iter_array, DBUS_TYPE_STRING, (gchar *) item);
+  dbus_message_iter_append_basic (iter_array, DBUS_TYPE_STRING, (gchar **) &item);
 }
 
 static DBusMessage *
@@ -215,6 +215,8 @@ signal_handler (DBusConnection *bus, DBusMessage *message, void *user_data)
 static gchar *app_reg_sig_match = "type='signal', interface='org.freedesktop.atspi.Tree', member='registerApplication'";
 static gchar *app_dereg_sig_match = "type='signal', interface='org.freedesktop.atspi.Tree', member='deregisterApplication'";
 
+static gchar *app_sig_match_blank = "";
+
 static DBusObjectPathVTable reg_vtable =
 {
   NULL,
@@ -231,8 +233,9 @@ spi_registry_new (DBusConnection *bus)
 
   dbus_connection_register_object_path(bus, SPI_DBUS_PATH_REGISTRY, &reg_vtable, reg);
 
-  dbus_bus_add_match (bus, app_reg_sig_match, NULL);
-  dbus_bus_add_match (bus, app_dereg_sig_match, NULL);
+  //dbus_bus_add_match (bus, app_reg_sig_match, NULL);
+  //dbus_bus_add_match (bus, app_dereg_sig_match, NULL);
+  dbus_bus_add_match (bus, app_sig_match_blank, NULL);
   dbus_connection_add_filter (bus, signal_handler, reg, NULL);
 
   return reg;

diff --git a/registryd/testregistry.py b/registryd/testregistry.py
index 5cbfbe1..2bb684f 100644 (file)
--- a/registryd/testregistry.py
+++ b/registryd/testregistry.py
@@ -13,11 +13,11 @@ class Emitter (dbus.service.Object):
        def __init__(self, bus, object_path):
                dbus.service.Object.__init__(self, bus, object_path)
 
-       @dbus.service.signal(dbus_interface='org.freedekstop.atspi.Tree', signature='s')
+       @dbus.service.signal(dbus_interface='org.freedesktop.atspi.Tree', signature='s')
        def registerApplication(self, app_name):
                pass
 
-       @dbus.service.signal(dbus_interface='org.freedekstop.atspi.Tree', signature='s')
+       @dbus.service.signal(dbus_interface='org.freedesktop.atspi.Tree', signature='s')
        def deregisterApplication(self, app_name):
                pass
 
@@ -35,7 +35,7 @@ class IdleStateM (object):
 
        def setup(self):
                self.emit = Emitter(self._bus, "/org/freedesktop/atspi/tree")
-               self.obj = self._bus.get_object("org.freedesktop.atspi.Registry", "/org/freedesktop/atspi/Registry")
+               self.obj = self._bus.get_object("org.freedesktop.atspi.Registry", "/org/freedesktop/atspi/registry")
                self.itf = dbus.Interface(self.obj, dbus_interface="org.freedesktop.atspi.Registry")
                return self.emit_registers