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

        * registryd/registry.c
        * registryd/registry-main.c
          Initialize GSList element of droute to null
          to prevent segfault.

diff --cc registryd/registry-main.c
index ba613c9,dd42775..4559fd7
--- 1/registryd/registry-main.c
--- 2/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@@ -99,19 -85,8 +99,20 @@@ main (int argc, char **argv
        g_print ("SpiRegistry daemon is running with well-known name - %s\n", dbus_name);
      }
  
 -  /*dec = spi_registry_dec_new (bus);*/
 +  /* Set up D-Route for use by the dec */
++  droute.interfaces = NULL;
 +  if (!dbus_connection_register_object_path (droute.bus,
 +                                             "/org/freedesktop/atspi/registry/deviceeventcontroller",
 +                                             &droute_vtable,
 +                                             &droute))
 +  {
 +    g_error("AT-SPI Registry daemon: Couldn't register droute.\n");
 +    return 0;
 +  }
 +
    registry = spi_registry_new (bus);
 +  dec = spi_registry_dec_new (registry, &droute);
 +  droute.user_data = dec;
  
    g_main_loop_run (mainloop);
    return 0;

diff --cc registryd/registry.c
index 240554d,2ef53d0..60b77a0
--- 1/registryd/registry.c
--- 2/registryd/registry.c
+++ b/registryd/registry.c
@@@ -235,7 -214,7 +235,6 @@@ message_handler (DBusConnection *bus, D
    DBusMessage *reply = NULL;
    guint res = DBUS_HANDLER_RESULT_HANDLED;
  
--
    int mtype;
    const char *itf;
    const char *name;