}
else
{
- GtkAtSpiContext *ctx = GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (GTK_ACCESSIBLE (child)));
+ GtkATContext *context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
+ GtkAtSpiContext *ctx = GTK_AT_SPI_CONTEXT (context);
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (ctx)));
+
+ g_object_unref (context);
}
}
else if (g_strcmp0 (method_name, "GetExtents") == 0)
};
GtkAccessibleValue *value;
GList *list, *l;
- GtkATContext *target_ctx;
int i;
for (i = 0; i < G_N_ELEMENTS (map); i++)
for (l = list; l; l = l->next)
{
- target_ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (l->data));
+ GtkATContext *target_ctx =
+ gtk_accessible_get_at_context (GTK_ACCESSIBLE (l->data));
/* Realize the ATContext of the target, so we can ask for its ref */
gtk_at_context_realize (target_ctx);
g_variant_builder_add (&b, "@(so)",
gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (target_ctx)));
+
+ g_object_unref (target_ctx);
}
g_variant_builder_add (builder, "(ua(so))", map[i].s, &b);
get_index_in (GtkAccessible *parent,
GtkAccessible *child)
{
- GtkAccessible *candidate;
- guint res;
-
if (parent == NULL)
return -1;
- res = 0;
+ guint res = 0;
+ GtkAccessible *candidate;
for (candidate = gtk_accessible_get_first_accessible_child (parent);
candidate != NULL;
candidate = gtk_accessible_get_next_accessible_sibling (candidate))
{
if (candidate == child)
- return res;
+ {
+ g_object_unref (candidate);
+ return res;
+ }
if (!gtk_accessible_should_present (candidate))
- continue;
+ {
+ g_object_unref (candidate);
+ continue;
+ }
res++;
+
+ g_object_unref (candidate);
}
return -1;
GtkAccessible *parent = gtk_accessible_get_accessible_parent (accessible);
if (parent != NULL)
- return get_index_in (parent, accessible);
+ {
+ int res = get_index_in (parent, accessible);
+
+ g_object_unref (parent);
+
+ return res;
+ }
return -1;
}
get_parent_context_ref (GtkAccessible *accessible)
{
GVariant *res = NULL;
-
GtkAccessible *parent = gtk_accessible_get_accessible_parent (accessible);
if (parent == NULL)
GtkAtSpiContext *self = GTK_AT_SPI_CONTEXT (context);
res = gtk_at_spi_root_to_ref (self->root);
+
+ g_object_unref (context);
}
else
{
GtkATContext *parent_context = gtk_accessible_get_at_context (parent);
+
gtk_at_context_realize (parent_context);
res = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (parent_context));
+
+ g_object_unref (parent_context);
+ g_object_unref (parent);
}
if (res == NULL)
{
GtkATContext *context = NULL;
GtkAccessible *accessible;
+ GtkAccessible *child = NULL;
int idx, presentable_idx;
g_variant_get (parameters, "(i)", &idx);
accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));
- GtkAccessible *child;
-
presentable_idx = 0;
+
for (child = gtk_accessible_get_first_accessible_child (accessible);
child != NULL;
child = gtk_accessible_get_next_accessible_sibling (child))
{
if (!gtk_accessible_should_present (child))
+ {
+ g_object_unref (child);
continue;
+ }
if (presentable_idx == idx)
break;
- presentable_idx++;
+ presentable_idx += 1;
+
+ g_object_unref (child);
}
- if (child)
+
+ if (child != NULL)
{
context = gtk_accessible_get_at_context (child);
+ g_object_unref (child);
}
if (context == NULL)
gtk_at_context_realize (context);
GVariant *ref = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (context));
-
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", ref));
+
+ g_object_unref (context);
}
else if (g_strcmp0 (method_name, "GetChildren") == 0)
{
GVariantBuilder builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("a(so)"));
GtkAccessible *accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));
+ GtkAccessible *child = NULL;
- GtkAccessible *child;
for (child = gtk_accessible_get_first_accessible_child (accessible);
child != NULL;
child = gtk_accessible_get_next_accessible_sibling (child))
- {
+ {
if (!gtk_accessible_should_present (child))
- continue;
+ {
+ g_object_unref (child);
+ continue;
+ }
GtkATContext *context = gtk_accessible_get_at_context (child);
if (ref != NULL)
g_variant_builder_add (&builder, "@(so)", ref);
+
+ g_object_unref (context);
+ g_object_unref (child);
}
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a(so))", &builder));
if (changed_states & GTK_ACCESSIBLE_STATE_CHANGE_HIDDEN)
{
- GtkAccessible *parent;
- GtkATContext *context;
GtkAccessibleChildChange change;
value = gtk_accessible_attribute_set_get_value (states, GTK_ACCESSIBLE_STATE_HIDDEN);
}
else
{
- parent = gtk_accessible_get_accessible_parent (accessible);
+ GtkAccessible *parent =
+ gtk_accessible_get_accessible_parent (accessible);
+ GtkATContext *context =
+ gtk_accessible_get_at_context (parent);
- context = gtk_accessible_get_at_context (parent);
gtk_at_context_child_changed (context, change, accessible);
+
+ g_object_unref (context);
+ g_object_unref (parent);
}
}
int idx = 0;
if (parent == NULL)
- idx = -1;
+ {
+ idx = -1;
+ }
else if (parent == accessible)
- idx = get_index_in (accessible, child);
+ {
+ idx = get_index_in (accessible, child);
+ g_object_unref (parent);
+ }
+ else
+ {
+ g_object_unref (parent);
+ }
if (change & GTK_ACCESSIBLE_CHILD_CHANGE_ADDED)
emit_children_changed (self,
GTK_AT_SPI_CONTEXT (child_context),
idx,
GTK_ACCESSIBLE_CHILD_STATE_REMOVED);
+
+ g_object_unref (child_context);
}
/* }}} */
/* {{{ D-Bus Registration */
int n_children = 0;
GtkAccessible *child = NULL;
-
for (child = gtk_accessible_get_first_accessible_child (accessible);
child != NULL;
child = gtk_accessible_get_next_accessible_sibling (child))
{
if (!gtk_accessible_should_present (child))
- continue;
+ {
+ g_object_unref (child);
+ continue;
+ }
+
+ n_children += 1;
- n_children++;
+ g_object_unref (child);
}
return n_children;
const char *path = gtk_at_spi_context_get_context_path (GTK_AT_SPI_CONTEXT (context));
g_dbus_method_invocation_return_value (invocation, g_variant_new ("((so))", name, path));
+
+ g_object_unref (context);
}
else if (g_strcmp0 (method_name, "GetChildren") == 0)
{
const char *path = gtk_at_spi_context_get_context_path (GTK_AT_SPI_CONTEXT (context));
g_variant_builder_add (&builder, "(so)", name, path);
+
+ g_object_unref (context);
}
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a(so))", &builder));
GtkATContext *context = gtk_accessible_get_at_context (child);
window_ref = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (context));
+
+ g_object_unref (context);
}
switch (change)
else
{
GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (counter.child));
- g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_object_unref (ctx);
}
}
else if (g_strcmp0 (method_name, "SelectChild") == 0)
{
GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_object_unref (ctx);
}
}
else if (g_strcmp0 (method_name, "SelectChild") == 0)
else
{
GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (counter.child));
- g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_object_unref (ctx);
}
}
else if (g_strcmp0 (method_name, "SelectChild") == 0)
{
GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_object_unref (ctx);
}
}
else if (g_strcmp0 (method_name, "SelectChild") == 0)
{
GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
+ g_object_unref (ctx);
}
}
else if (g_strcmp0 (method_name, "SelectChild") == 0)
* gtk_accessible_get_at_context:
* @self: a `GtkAccessible`
*
- * Retrieves the `GtkATContext` for the given `GtkAccessible`.
+ * Retrieves the accessible implementation for the given `GtkAccessible`.
*
- * Returns: (transfer none): the `GtkATContext`
+ * Returns: (transfer full): the accessible implementation object
*
* Since: 4.10
*/
* gtk_accessible_get_accessible_parent:
* @self: a `GtkAccessible`
*
- * Retrieves the accessible accessible for an accessible object
+ * Retrieves the accessible parent for an accessible object.
*
- * This function returns `NULL` for top level widgets
+ * This function returns `NULL` for top level widgets.
*
- * Returns: (transfer none) (nullable): the accessible parent
+ * Returns: (transfer full) (nullable): the accessible parent
*
* Since: 4.10
*/
context = gtk_accessible_get_at_context (self);
if (context != NULL)
parent = gtk_at_context_get_accessible_parent (context);
-
+
if (parent != NULL)
- return parent;
+ return g_object_ref (parent);
else
return GTK_ACCESSIBLE_GET_IFACE (self)->get_accessible_parent (self);
}
* @new_sibling: (nullable): the new next accessible sibling to set
*
* Updates the next accessible sibling of @self.
+ *
* That might be useful when a new child of a custom `GtkAccessible`
* is created, and it needs to be linked to a previous child.
*
context = gtk_accessible_get_at_context (self);
if (!context)
return;
-
+
if (gtk_at_context_get_accessible_parent (context) == NULL)
{
g_critical ("Failed to update next accessible sibling: no parent accessible set for this accessible");
*
* Retrieves the first accessible child of an accessible object.
*
- * Returns: (transfer none) (nullable): the first accessible child
+ * Returns: (transfer full) (nullable): the first accessible child
*
* since: 4.10
*/
*
* Retrieves the next accessible sibling of an accessible object
*
- * Returns: (transfer none) (nullable): the next accessible sibling
+ * Returns: (transfer full) (nullable): the next accessible sibling
*
* since: 4.10
*/
context = gtk_accessible_get_at_context (self);
if (context != NULL && gtk_at_context_get_accessible_parent (context) != NULL)
- return gtk_at_context_get_next_accessible_sibling (context);
+ {
+ GtkAccessible *sibling = gtk_at_context_get_next_accessible_sibling (context);
+
+ if (sibling != NULL)
+ return g_object_ref (sibling);
+
+ return NULL;
+ }
else
return GTK_ACCESSIBLE_GET_IFACE (self)->get_next_accessible_sibling (self);
}
* Retrieves the platform-specific accessibility context for the
* accessible implementation.
*
- * Returns: (transfer none) (nullable): the accessibility context
+ * Returns: (transfer full) (nullable): the accessibility context
*
* Since: 4.10
*/
*
* This virtual function should return `NULL` for top level objects.
*
- * Returns: (nullable) (transfer none): the accessible parent
+ * Returns: (nullable) (transfer full): the accessible parent
*
* Since: 4.10
*/
*
* Retrieves the first accessible child of an accessible object.
*
- * Returns: (transfer none) (nullable): an accessible object
+ * Returns: (transfer full) (nullable): an accessible object
*
* Since: 4.10
*/
*
* Retrieves the next accessible sibling of an accessible object.
*
- * Returns: (transfer none) (nullable): an accessible object
+ * Returns: (transfer full) (nullable): an accessible object
*
* Since: 4.10
*/
display = gdk_display_get_default ();
page->at_context = gtk_at_context_create (role, accessible, display);
+ if (page->at_context == NULL)
+ return NULL;
}
- return page->at_context;
+ return g_object_ref (page->at_context);
}
static gboolean
gtk_stack_page_accessible_get_accessible_parent (GtkAccessible *accessible)
{
GtkStackPage *page = GTK_STACK_PAGE (accessible);
+ GtkWidget *parent;
if (page->widget == NULL)
return NULL;
- else
- return GTK_ACCESSIBLE (gtk_widget_get_parent (page->widget));
+
+ parent = _gtk_widget_get_parent (page->widget);
+
+ return GTK_ACCESSIBLE (g_object_ref (parent));
}
static GtkAccessible *
-gtk_stack_page_accessible_get_first_accessible_child(GtkAccessible *accessible)
+gtk_stack_page_accessible_get_first_accessible_child (GtkAccessible *accessible)
{
GtkStackPage *page = GTK_STACK_PAGE (accessible);
+ GtkWidget *child;
- if (page->widget != NULL)
- return GTK_ACCESSIBLE (page->widget);
- else
+ if (page->widget == NULL)
return NULL;
+
+ child = _gtk_widget_get_first_child (page->widget);
+
+ return GTK_ACCESSIBLE (g_object_ref (child));
}
static GtkAccessible *
-gtk_stack_page_accessible_get_next_accessible_sibling(GtkAccessible *accessible)
+gtk_stack_page_accessible_get_next_accessible_sibling (GtkAccessible *accessible)
{
GtkStackPage *page = GTK_STACK_PAGE (accessible);
- return GTK_ACCESSIBLE (page->next_page);
+ if (page->next_page == NULL)
+ return NULL;
+
+ return GTK_ACCESSIBLE (g_object_ref (page->next_page));
}
static gboolean
GtkStack *stack = GTK_STACK (accessible);
GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
GtkStackPage *page = g_ptr_array_index (priv->children, 0);
- return GTK_ACCESSIBLE (page);
+
+ return GTK_ACCESSIBLE (g_object_ref (page));
}
static void
static GtkAccessible *
gtk_widget_accessible_get_accessible_parent (GtkAccessible *self)
{
- return GTK_ACCESSIBLE (gtk_widget_get_parent (GTK_WIDGET (self)));
+ GtkWidget *parent = _gtk_widget_get_parent (GTK_WIDGET (self));
+
+ if (parent == NULL)
+ return NULL;
+
+ return GTK_ACCESSIBLE (g_object_ref (parent));
}
static GtkAccessible *
gtk_widget_accessible_get_next_accessible_sibling (GtkAccessible *self)
{
- return GTK_ACCESSIBLE (gtk_widget_get_next_sibling (GTK_WIDGET (self)));
+ GtkWidget *sibling = _gtk_widget_get_next_sibling (GTK_WIDGET (self));
+
+ if (sibling == NULL)
+ return NULL;
+
+ return GTK_ACCESSIBLE (g_object_ref (sibling));
}
static GtkAccessible *
gtk_widget_accessible_get_first_accessible_child (GtkAccessible *self)
{
- return GTK_ACCESSIBLE (gtk_widget_get_first_child (GTK_WIDGET (self)));
+ GtkWidget *child = _gtk_widget_get_first_child (GTK_WIDGET (self));
+
+ if (child == NULL)
+ return NULL;
+
+ return GTK_ACCESSIBLE (g_object_ref (child));
}
static gboolean
projects / gtk4.git / commitdiff