gint childcount;
GSList *l;
+ g_assert(data != NULL);
+
dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL,
&iter_struct);
path = spi_dbus_get_path (obj);
DBusMessageIter iter, iter_array;
dbus_bool_t result;
+ g_assert(data != NULL);
+
dbus_message_iter_init_append (message, &iter);
dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ooaoassus)",
&iter_array);
g_string_append_printf(output, spi_introspection_node_element, path);
- spi_append_interface(output, "org.freedesktop.atspi.Tree");
+ spi_append_interface(output, SPI_DBUS_INTERFACE_TREE);
g_string_append(output, spi_introspection_footer);
final = g_string_free(output, FALSE);
const char *member = dbus_message_get_member (message);
DBusMessage *reply = NULL;
+
+ g_return_val_if_fail(iface != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
- if (!strcmp(iface, "org.freedesktop.atspi.Tree"))
+ if (!strcmp(iface, SPI_DBUS_INTERFACE_TREE))
{
if (!strcmp(member, "getRoot"))
{
void
spi_register_tree_object(DBusConnection *bus,
+ DRouteData *data,
const char *path)
{
dbus_bool_t mem = FALSE;
- mem = dbus_connection_register_object_path(bus, path, &tree_vtable, NULL);
+ mem = dbus_connection_register_object_path(bus, path, &tree_vtable, data);
g_assert(mem == TRUE);
}
break;
}
g_hash_table_remove(cache_list, path);
- }
+}
gboolean spi_dbus_update_cache(DRouteData *data)
{
DBusMessageIter iter;
CacheIterData d;
+ g_assert(data != NULL);
+
if (update_pending == 0) return FALSE;
//printf("Sending cache\n");
- message = dbus_message_new_signal("/org/freedesktop/atspi/tree", "org.freedesktop.atspi.Tree", "UpdateTree");
+ message = dbus_message_new_signal ("/org/freedesktop/atspi/tree", SPI_DBUS_INTERFACE_TREE, "updateTree");
if (!message) goto done;
dbus_message_iter_init_append (message, &iter);
dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ooaoassus)",