diff options
author | Mark Doffman <mdoff@silver-wind.(none)> | 2008-12-18 11:53:42 +0000 |
---|---|---|
committer | Mark Doffman <mdoff@silver-wind.(none)> | 2008-12-18 12:25:50 +0000 |
commit | 8ea015764f1509bf78b64065072a3de0d9a8abbe (patch) | |
tree | 4f88fe6b84186143ac49292621a8d77d6aedbfd8 /cspi | |
parent | 95ac4886d1b6649d54daffa7191be1b2bbaf2989 (diff) | |
download | at-spi2-atk-8ea015764f1509bf78b64065072a3de0d9a8abbe.tar.gz |
2008-12-18 Mark Doffman <mark.doffman@codethink.co.uk>
* Makefile.am
Move dbind to before droute folder.
droute now depends on dbind library.
* cspi/*
Change to cspi to fit with interface
changes to dbind made in previous commit.
* dbind/*
Addition of varargs reentrant method call.
Used in cspi.
Diffstat (limited to 'cspi')
-rw-r--r-- | cspi/spi-listener.c | 2 | ||||
-rw-r--r-- | cspi/spi-main.c | 8 | ||||
-rw-r--r-- | cspi/spi-registry.c | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/cspi/spi-listener.c b/cspi/spi-listener.c index 57f0bfb..e314999 100644 --- a/cspi/spi-listener.c +++ b/cspi/spi-listener.c @@ -388,7 +388,7 @@ cspi_dbus_handle_deviceEvent (DBusConnection *bus, DBusMessage *message, void *d goto done; } dbus_message_iter_init (message, &iter); - dbind_any_demarshal (iter, &deviceEvent_type, &p); + dbind_any_demarshal (&iter, (char **) &deviceEvent_type, &p); klass = CSPI_DEVICE_LISTENER_GET_CLASS (listener); if (klass->device_event) { diff --git a/cspi/spi-main.c b/cspi/spi-main.c index 3485a5a..e824c6a 100644 --- a/cspi/spi-main.c +++ b/cspi/spi-main.c @@ -413,7 +413,7 @@ add_app_to_desktop (Accessible *a, const char *bus_name) char *root_path; dbus_error_init (&error); - if (dbind_connection_method_call (bus, bus_name, "/org/freedesktop/atspi/tree", spi_interface_tree, "getRoot", &error, "=>o", &root_path)) + if (dbind_method_call_reentrant (bus, bus_name, "/org/freedesktop/atspi/tree", spi_interface_tree, "getRoot", &error, "=>o", &root_path)) { Accessible *obj = cspi_ref_accessible (bus_name, root_path); if (obj) @@ -505,7 +505,7 @@ ref_accessible_desktop (CSpiApplication *app) desktop->ref_count = 2; /* one for the caller, one for the hash */ desktop->name = g_strdup (""); dbus_error_init (&error); - if (!dbind_connection_method_call (bus, spi_bus_registry, spi_path_registry, spi_interface_registry, "getApplications", &error, "=>as", &apps)) + if (!dbind_method_call_reentrant (bus, spi_bus_registry, spi_path_registry, spi_interface_registry, "getApplications", &error, "=>as", &apps)) { g_error ("Couldn't get application list: %s", error.message); } @@ -520,7 +520,7 @@ ref_accessible_desktop (CSpiApplication *app) CSpiApplication *app = cspi_get_application (app_name); additions = NULL; dbus_error_init (&error); - dbind_connection_method_call (bus, app_name, "/org/freedesktop/atspi/tree", spi_interface_tree, "getTree", &error, "=>a(ooaoassusau)", &additions); + dbind_method_call_reentrant (bus, app_name, "/org/freedesktop/atspi/tree", spi_interface_tree, "getTree", &error, "=>a(ooaoassusau)", &additions); if (error.message) { g_warning ("getTree (%s): %s", app_name, error.message); @@ -1019,7 +1019,7 @@ cspi_dbus_call (Accessible *obj, const char *interface, const char *method, DBus if (!error) error = &err; dbus_error_init (error); va_start (args, type); - retval = dbind_connection_method_call_va (SPI_bus(), obj->app->bus_name, path, interface, method, error, type, args); + retval = dbind_method_call_reentrant_va (SPI_bus(), obj->app->bus_name, path, interface, method, error, type, args); va_end (args); g_free (path); if (dbus_error_is_set (error)) diff --git a/cspi/spi-registry.c b/cspi/spi-registry.c index 6e432ec..d920cf0 100644 --- a/cspi/spi-registry.c +++ b/cspi/spi-registry.c @@ -210,7 +210,7 @@ SPI_registerAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener, (dbus_bool_t) ((sync_type & SPI_KEYLISTENER_ALL_WINDOWS)!=0); dbus_error_init (&error); - dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "registerKeystrokeListener", &error, "oa(iisi)uu(bbb)=>b", path, key_set, controller_event_mask, key_set, &listener_mode, &retval); + dbind_method_call_reentrant (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "registerKeystrokeListener", &error, "oa(iisi)uu(bbb)=>b", path, key_set, controller_event_mask, key_set, &listener_mode, &retval); g_array_free (key_set, TRUE); g_free (path); @@ -249,7 +249,7 @@ SPI_deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener controller_event_mask = (dbus_uint32_t) modmask; key_set = g_array_sized_new (FALSE, TRUE, sizeof (Accessibility_KeyDefinition), 0); - dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "deregisterKeystrokeListener", &error, "oa(iisi)uu", path, &key_set, key_events, controller_event_mask); + dbind_method_call_reentrant (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "deregisterKeystrokeListener", &error, "oa(iisi)uu", path, &key_set, key_events, controller_event_mask); g_free (path); return TRUE; } @@ -294,7 +294,7 @@ SPI_registerDeviceEventListener (AccessibleDeviceListener *listener, } dbus_error_init (&error); - dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "registerDeviceEventListener", &error, "ou=>b", path, event_types, &retval); + dbind_method_call_reentrant (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "registerDeviceEventListener", &error, "ou=>b", path, event_types, &retval); g_free (path); return retval; } @@ -327,7 +327,7 @@ SPI_deregisterDeviceEventListener (AccessibleDeviceListener *listener, event_types |= (1 << Accessibility_BUTTON_RELEASED_EVENT); dbus_error_init (&error); - dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "deregisterDeviceEventListener", &error, "ou", path, event_types); + dbind_method_call_reentrant (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "deregisterDeviceEventListener", &error, "ou", path, event_types); g_free (path); return TRUE; } @@ -383,7 +383,7 @@ SPI_generateKeyboardEvent (long int keyval, if (!keystring) keystring = ""; dbus_error_init (&error); - dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "generateKeyboardEvent", &error, "isu", keycode, keystring, keysynth_type); + dbind_method_call_reentrant (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "generateKeyboardEvent", &error, "isu", keycode, keystring, keysynth_type); return TRUE; } @@ -411,7 +411,7 @@ SPI_generateMouseEvent (long x, long y, char *name) DBusError error; dbus_error_init (&error); - dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "generateMouseEvent", &error, "iis", x, y, name); + dbind_method_call_reentrant (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "generateMouseEvent", &error, "iis", x, y, name); return TRUE; } |