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
Don't return DBUS_HANDLER_RESULT_HANDLED for NameOwnerChanged signals
[platform/core/uifw/at-spi2-atk.git]
/
atk-adaptor
/
bridge.c
diff --git
a/atk-adaptor/bridge.c
b/atk-adaptor/bridge.c
index
2df9889
..
7dd355b
100644
(file)
--- a/
atk-adaptor/bridge.c
+++ b/
atk-adaptor/bridge.c
@@
-434,6
+434,8
@@
socket_ref_state_set (AtkObject *accessible)
static void
socket_embed_hook (AtkSocket * socket, gchar * plug_id)
{
static void
socket_embed_hook (AtkSocket * socket, gchar * plug_id)
{
+ g_return_if_fail (spi_global_register != NULL);
+
AtkObject *accessible = ATK_OBJECT(socket);
gchar *plug_name, *plug_path;
AtkObjectClass *klass;
AtkObject *accessible = ATK_OBJECT(socket);
gchar *plug_name, *plug_path;
AtkObjectClass *klass;
@@
-678,7
+680,6
@@
signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
!g_strcmp0(member, "NameOwnerChanged"))
{
char *name, *old, *new;
!g_strcmp0(member, "NameOwnerChanged"))
{
char *name, *old, *new;
- result = DBUS_HANDLER_RESULT_HANDLED;
if (dbus_message_get_args (message, NULL,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_STRING, &old,
if (dbus_message_get_args (message, NULL,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_STRING, &old,
@@
-938,7
+939,8
@@
atk_bridge_adaptor_cleanup (void)
GList *l;
GSList *ls;
GList *l;
GSList *ls;
- g_return_if_fail (inited);
+ if (!inited)
+ return;
if (!spi_global_app_data)
return;
if (!spi_global_app_data)
return;