projects
/
platform
/
upstream
/
at-spi2-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce action related IPC
[platform/upstream/at-spi2-core.git]
/
atspi
/
atspi-relation.c
diff --git
a/atspi/atspi-relation.c
b/atspi/atspi-relation.c
index
cbd6b2d
..
82bb668
100644
(file)
--- a/
atspi/atspi-relation.c
+++ b/
atspi/atspi-relation.c
@@
-4,6
+4,7
@@
*
* Copyright 2001, 2002 Sun Microsystems Inc.,
* Copyright 2001, 2002 Ximian, Inc.
*
* Copyright 2001, 2002 Sun Microsystems Inc.,
* Copyright 2001, 2002 Ximian, Inc.
+ * Copyright 2010, 2011 Novell, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@
-27,7
+28,7
@@
* atspi_relation_get_relation_type:
* @obj: a pointer to the #AtspiRelation object to query.
*
* atspi_relation_get_relation_type:
* @obj: a pointer to the #AtspiRelation object to query.
*
- * Get the type of relationship represented by an #AtspiRelation.
+ * Get
s
the type of relationship represented by an #AtspiRelation.
*
* Returns: an #AtspiRelationType indicating the type of relation
* encapsulated in this #AtspiRelation object.
*
* Returns: an #AtspiRelationType indicating the type of relation
* encapsulated in this #AtspiRelation object.
@@
-43,12
+44,12
@@
atspi_relation_get_relation_type (AtspiRelation *obj)
* atspi_relation_get_n_targets:
* @obj: a pointer to the #AtspiRelation object to query.
*
* atspi_relation_get_n_targets:
* @obj: a pointer to the #AtspiRelation object to query.
*
- * Get the number of objects which this relationship has as its
- * target objects (the subject is the #Accessible from which this
+ * Get
s
the number of objects which this relationship has as its
+ * target objects (the subject is the #A
tspiA
ccessible from which this
* #AtspiRelation originated).
*
* #AtspiRelation originated).
*
- * Returns: a
short integer
indicating how many target objects which the
- * originating #Accessible object has the #AtspiRelation
+ * Returns: a
#gint
indicating how many target objects which the
+ * originating #A
tspiA
ccessible object has the #AtspiRelation
* relationship with.
**/
gint
* relationship with.
**/
gint
@@
-60,9
+61,9
@@
atspi_relation_get_n_targets (AtspiRelation *obj)
/**
* atspi_relation_get_target:
* @obj: a pointer to the #AtspiRelation object to query.
/**
* atspi_relation_get_target:
* @obj: a pointer to the #AtspiRelation object to query.
- * @i: a (zero-index)
integer
indicating which (of possibly several) target is requested.
+ * @i: a (zero-index)
#gint
indicating which (of possibly several) target is requested.
*
*
- * Get the @i-th target of a specified #AtspiRelation relationship.
+ * Get
s
the @i-th target of a specified #AtspiRelation relationship.
*
* Returns: (transfer full): an #AtspiAccessible which is the @i-th object
* with which the originating #AtspiAccessible has relationship
*
* Returns: (transfer full): an #AtspiAccessible which is the @i-th object
* with which the originating #AtspiAccessible has relationship
@@
-98,11
+99,8
@@
_atspi_relation_new_from_iter (DBusMessageIter *iter)
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
{
AtspiAccessible *accessible;
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
{
AtspiAccessible *accessible;
- GArray *new_array;
accessible = _atspi_dbus_return_accessible_from_iter (&iter_array);
accessible = _atspi_dbus_return_accessible_from_iter (&iter_array);
- new_array = g_array_append_val (relation->targets, accessible);
- if (new_array)
- relation->targets = new_array;
+ relation->targets = g_array_append_val (relation->targets, accessible);
/* Iter was moved already, so no need to call dbus_message_iter_next */
}
return relation;
/* Iter was moved already, so no need to call dbus_message_iter_next */
}
return relation;