GPtrArray *matchrule_array;
gint i;
GList *l;
+ gboolean result = TRUE;
+ if (!callback)
+ {
+ return FALSE;
+ }
if (!convert_event_type_to_dbus (event_type, &category, &name, &detail, &matchrule_array))
{
return FALSE;
}
- if (!callback)
- {
- return FALSE;
- }
for (l = event_listeners; l;)
{
atspi_path_registry,
atspi_interface_registry,
"DeregisterEvent");
- if (!message)
- return FALSE;
+ if (!message) {
+ result = FALSE;
+ break;
+ }
dbus_message_append_args (message, DBUS_TYPE_STRING, &event_type, DBUS_TYPE_INVALID);
reply = _atspi_dbus_send_with_reply_and_block (message, error);
if (reply)
for (i = 0; i < matchrule_array->len; i++)
g_free (g_ptr_array_index (matchrule_array, i));
g_ptr_array_free (matchrule_array, TRUE);
- return TRUE;
+ return result;
}
/**
return TRUE;
if (!event_detail)
- return (listener_detail ? FALSE : TRUE);
+ return FALSE;
return !(listener_detail [strcspn (listener_detail, ":")] == '\0'
? strncmp (listener_detail, event_detail,
memset (&e, 0, sizeof (e));
- if (category)
+ if (!category)
{
- category = g_utf8_strrchr (category, -1, '.');
- if (category == NULL)
- {
- // TODO: Error
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- }
- category++;
+ // TODO: Error
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
+
+ category = g_utf8_strrchr (category, -1, '.');
+ if (category == NULL)
+ {
+ // TODO: Error
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+ category++;
+
dbus_message_iter_get_basic (&iter, &detail);
dbus_message_iter_next (&iter);
dbus_message_iter_get_basic (&iter, &detail1);