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
Removed the extra boolean parameter added to know when to unref the
[platform/core/uifw/at-spi2-atk.git]
/
atk-adaptor
/
adaptors
/
selection-adaptor.c
diff --git
a/atk-adaptor/adaptors/selection-adaptor.c
b/atk-adaptor/adaptors/selection-adaptor.c
index
4516b52
..
353113d
100644
(file)
--- a/
atk-adaptor/adaptors/selection-adaptor.c
+++ b/
atk-adaptor/adaptors/selection-adaptor.c
@@
-26,7
+26,8
@@
#include <droute/droute.h>
#include "common/spi-dbus.h"
#include <droute/droute.h>
#include "common/spi-dbus.h"
-#include "accessible-marshaller.h"
+#include "object.h"
+#include "introspection.h"
static dbus_bool_t
impl_get_NSelectedChildren (DBusMessageIter * iter, void *user_data)
static dbus_bool_t
impl_get_NSelectedChildren (DBusMessageIter * iter, void *user_data)
@@
-52,6
+53,7
@@
impl_GetSelectedChild (DBusConnection * bus, DBusMessage * message,
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
+ DBusMessage *reply;
DBusError error;
dbus_int32_t selectedChildIndex;
AtkObject *atk_object;
DBusError error;
dbus_int32_t selectedChildIndex;
AtkObject *atk_object;
@@
-66,7
+68,10
@@
impl_GetSelectedChild (DBusConnection * bus, DBusMessage * message,
return droute_invalid_arguments_error (message);
}
atk_object = atk_selection_ref_selection (selection, selectedChildIndex);
return droute_invalid_arguments_error (message);
}
atk_object = atk_selection_ref_selection (selection, selectedChildIndex);
- return spi_dbus_return_object (message, atk_object, TRUE, TRUE);
+ reply = spi_object_return_reference (message, atk_object);
+ g_object_unref (atk_object);
+
+ return reply;
}
static DBusMessage *
}
static DBusMessage *
@@
-255,5
+260,6
@@
spi_initialize_selection (DRoutePath * path)
{
droute_path_add_interface (path,
SPI_DBUS_INTERFACE_SELECTION,
{
droute_path_add_interface (path,
SPI_DBUS_INTERFACE_SELECTION,
+ spi_org_a11y_atspi_Selection,
methods, properties);
};
methods, properties);
};