projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use atspi_is_initialized to decide whether to expose p2p connection
[platform/core/uifw/at-spi2-atk.git]
/
atk-adaptor
/
event.c
diff --git
a/atk-adaptor/event.c
b/atk-adaptor/event.c
index
2875ffd
..
dc4e3ec
100644
(file)
--- a/
atk-adaptor/event.c
+++ b/
atk-adaptor/event.c
@@
-64,9
+64,8
@@
switch_main_context (GMainContext *cnx)
{
GList *list;
{
GList *list;
-#ifndef DISABLE_P2P
- atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
-#endif
+ if (spi_global_app_data->server)
+ atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx);
for (list = spi_global_app_data->direct_connections; list; list = list->next)
atspi_dbus_connection_setup_with_g_main (list->data, cnx);
atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx);
for (list = spi_global_app_data->direct_connections; list; list = list->next)
atspi_dbus_connection_setup_with_g_main (list->data, cnx);
@@
-99,15
+98,12
@@
send_and_allow_reentry (DBusConnection * bus, DBusMessage * message)
{
DBusPendingCall *pending;
SpiReentrantCallClosure closure;
{
DBusPendingCall *pending;
SpiReentrantCallClosure closure;
- GMainContext *main_context;
GSource *source;
GSource *source;
- main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL :
- spi_global_app_data->main_context);
closure.bus = bus;
closure.bus = bus;
- closure.loop = g_main_loop_new (main_context, FALSE);
+ closure.loop = g_main_loop_new (
spi_global_app_data->
main_context, FALSE);
closure.reply = NULL;
closure.reply = NULL;
- switch_main_context (main_context);
+ switch_main_context (
spi_global_app_data->
main_context);
if (!dbus_connection_send_with_reply (bus, message, &pending, 9000) || !pending)
{
if (!dbus_connection_send_with_reply (bus, message, &pending, 9000) || !pending)
{
@@
-117,7
+113,7
@@
send_and_allow_reentry (DBusConnection * bus, DBusMessage * message)
dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
source = g_timeout_source_new (500);
g_source_set_callback (source, timeout_reply, &closure, NULL);
dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
source = g_timeout_source_new (500);
g_source_set_callback (source, timeout_reply, &closure, NULL);
- closure.timeout = g_source_attach (source, main_context);
+ closure.timeout = g_source_attach (source,
spi_global_app_data->
main_context);
g_source_unref (source);
g_main_loop_run (closure.loop);
if (closure.timeout != -1)
g_source_unref (source);
g_main_loop_run (closure.loop);
if (closure.timeout != -1)
@@
-141,7
+137,6
@@
Accessibility_DeviceEventController_NotifyListenersSync (const
* key_event)
{
DBusMessage *message;
* key_event)
{
DBusMessage *message;
- DBusError error;
dbus_bool_t consumed = FALSE;
message =
dbus_bool_t consumed = FALSE;
message =
@@
-150,7
+145,6
@@
Accessibility_DeviceEventController_NotifyListenersSync (const
ATSPI_DBUS_INTERFACE_DEC,
"NotifyListenersSync");
ATSPI_DBUS_INTERFACE_DEC,
"NotifyListenersSync");
- dbus_error_init (&error);
if (spi_dbus_marshal_deviceEvent (message, key_event))
{
DBusMessage *reply =
if (spi_dbus_marshal_deviceEvent (message, key_event))
{
DBusMessage *reply =
@@
-159,8
+153,12
@@
Accessibility_DeviceEventController_NotifyListenersSync (const
{
DBusError error;
dbus_error_init (&error);
{
DBusError error;
dbus_error_init (&error);
- dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, &consumed,
- DBUS_TYPE_INVALID);
+ if (!dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN,
+ &consumed, DBUS_TYPE_INVALID))
+ {
+ /* TODO: print a warning */
+ dbus_error_free (&error);
+ }
dbus_message_unref (reply);
}
}
dbus_message_unref (reply);
}
}
@@
-372,7
+370,11
@@
signal_is_needed (const gchar *klass, const gchar *major, const gchar *minor)
* TODO: FOr 2.2, have at-spi2-core define a special "cache listener" for
* this instead, so that we don't send these if no one is listening */
if (!g_strcmp0 (data [1], "ChildrenChanged") ||
* TODO: FOr 2.2, have at-spi2-core define a special "cache listener" for
* this instead, so that we don't send these if no one is listening */
if (!g_strcmp0 (data [1], "ChildrenChanged") ||
- !g_strcmp0 (data [1], "PropertyChange") ||
+ ((!g_strcmp0 (data [1], "PropertyChange")) &&
+ (!g_strcmp0 (data [2], "accessible-name") ||
+ !g_strcmp0 (data [2], "accessible-description") ||
+ !g_strcmp0 (data [2], "accessible-parent") ||
+ !g_strcmp0 (data [2], "accessible-role"))) ||
!g_strcmp0 (data [1], "StateChanged"))
{
g_free (data [2]);
!g_strcmp0 (data [1], "StateChanged"))
{
g_free (data [2]);
@@
-437,7
+439,7
@@
emit_event (AtkObject *obj,
void (*append_variant) (DBusMessageIter *, const char *, const void *))
{
DBusConnection *bus = spi_global_app_data->bus;
void (*append_variant) (DBusMessageIter *, const char *, const void *))
{
DBusConnection *bus = spi_global_app_data->bus;
- c
onst c
har *path;
+ char *path;
char *minor_dbus;
gchar *cname;
char *minor_dbus;
gchar *cname;
@@
-623,7
+625,7
@@
state_event_listener (GSignalInvocationHint * signal_hint,
const GValue * param_values, gpointer data)
{
AtkObject *accessible;
const GValue * param_values, gpointer data)
{
AtkObject *accessible;
- gchar *pname;
+
const
gchar *pname;
guint detail1;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
guint detail1;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
@@
-852,7
+854,8
@@
text_insert_event_listener (GSignalInvocationHint * signal_hint,
guint text_changed_signal_id;
GSignalQuery signal_query;
const gchar *name;
guint text_changed_signal_id;
GSignalQuery signal_query;
const gchar *name;
- gchar *minor, *text;
+ const gchar *minor_raw, *text;
+ gchar *minor;
gint detail1 = 0, detail2 = 0;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
gint detail1 = 0, detail2 = 0;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
@@
-865,9
+868,9
@@
text_insert_event_listener (GSignalInvocationHint * signal_hint,
/* Add the insert and keep any detail coming from atk */
/* Add the insert and keep any detail coming from atk */
- minor = g_quark_to_string (signal_hint->detail);
- if (minor)
- minor = g_strconcat ("insert:", minor, NULL);
+ minor
_raw
= g_quark_to_string (signal_hint->detail);
+ if (minor
_raw
)
+ minor = g_strconcat ("insert:", minor
_raw
, NULL);
else
minor = g_strdup ("insert");
else
minor = g_strdup ("insert");
@@
-900,7
+903,8
@@
text_remove_event_listener (GSignalInvocationHint * signal_hint,
guint text_changed_signal_id;
GSignalQuery signal_query;
const gchar *name;
guint text_changed_signal_id;
GSignalQuery signal_query;
const gchar *name;
- gchar *minor, *text;
+ const gchar *minor_raw, *text;
+ gchar *minor;
gint detail1 = 0, detail2 = 0;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
gint detail1 = 0, detail2 = 0;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
@@
-911,12
+915,11
@@
text_remove_event_listener (GSignalInvocationHint * signal_hint,
g_signal_query (text_changed_signal_id, &signal_query);
name = signal_query.signal_name;
g_signal_query (text_changed_signal_id, &signal_query);
name = signal_query.signal_name;
- minor = g_quark_to_string (signal_hint->detail);
+ minor
_raw
= g_quark_to_string (signal_hint->detail);
/* Add the delete and keep any detail coming from atk */
/* Add the delete and keep any detail coming from atk */
- minor = g_quark_to_string (signal_hint->detail);
- if (minor)
- minor = g_strconcat ("delete:", minor, NULL);
+ if (minor_raw)
+ minor = g_strconcat ("delete:", minor_raw, NULL);
else
minor = g_strdup ("delete");
else
minor = g_strdup ("delete");
@@
-1016,6
+1019,7
@@
children_changed_event_listener (GSignalInvocationHint * signal_hint,
detail1);
emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
"(so)", ao, append_object);
detail1);
emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
"(so)", ao, append_object);
+ g_object_unref (ao);
}
else
{
}
else
{