summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2020-11-10 14:14:47 +0000
committerEmmanuele Bassi <ebassi@gnome.org>2020-11-10 14:31:56 +0000
commitc264254d4bc2e641042db744a9ada7504d53351f (patch)
treeb5f68e7ef81c33b3ce4eab9f5c41d1506d4d9569 /testsuite
parent6af89e90348ae83d1d88fbf094660205fa45989f (diff)
downloadgtk+-c264254d4bc2e641042db744a9ada7504d53351f.tar.gz
a11y: Parse reference lists using varargs
Using GList is a bit lame, and makes the API more complicated to use than necessary in the common case. The only real use case for a GList is gtk_widget_add_mnemonic_label(), and for that we can use the GValue-based API instead. Fixes: #3343
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/a11y/accessible.c15
-rw-r--r--testsuite/a11y/button.c6
-rw-r--r--testsuite/a11y/expander.c5
-rw-r--r--testsuite/a11y/general.c5
-rw-r--r--testsuite/a11y/label.c10
-rw-r--r--testsuite/a11y/scrollbar.c7
-rw-r--r--testsuite/a11y/stack.c9
7 files changed, 14 insertions, 43 deletions
diff --git a/testsuite/a11y/accessible.c b/testsuite/a11y/accessible.c
index b353d9e94e..2ea857ac3e 100644
--- a/testsuite/a11y/accessible.c
+++ b/testsuite/a11y/accessible.c
@@ -590,7 +590,6 @@ test_reflist_relation (gconstpointer data)
TestObject *object;
TestObject *other;
TestObject *third;
- GList *refs;
object = test_object_new (GTK_ACCESSIBLE_ROLE_CHECKBOX);
other = test_object_new (GTK_ACCESSIBLE_ROLE_CHECKBOX);
@@ -600,21 +599,15 @@ test_reflist_relation (gconstpointer data)
gtk_test_accessible_assert_relation (object, relation, NULL);
- refs = g_list_append (NULL, other);
-
gtk_accessible_update_relation (GTK_ACCESSIBLE (object),
- relation, refs,
+ relation, other, NULL,
-1);
- gtk_test_accessible_assert_relation (object, relation, refs);
-
- refs = g_list_append (refs, third);
+ gtk_test_accessible_assert_relation (object, relation, other, NULL);
gtk_accessible_update_relation (GTK_ACCESSIBLE (object),
- relation, refs,
+ relation, other, third, NULL,
-1);
- gtk_test_accessible_assert_relation (object, relation, refs);
-
- g_list_free (refs);
+ gtk_test_accessible_assert_relation (object, relation, other, third, NULL);
g_object_unref (object);
g_object_unref (other);
diff --git a/testsuite/a11y/button.c b/testsuite/a11y/button.c
index 803a2fecf8..105e424f0c 100644
--- a/testsuite/a11y/button.c
+++ b/testsuite/a11y/button.c
@@ -32,13 +32,11 @@ static void
button_relation (void)
{
GtkWidget *button = gtk_button_new_with_mnemonic ("_Hello");
- GList *list;
g_object_ref_sink (button);
- list = g_list_append (NULL, gtk_widget_get_first_child (button));
- gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (button), GTK_ACCESSIBLE_RELATION_LABELLED_BY, list);
- g_list_free (list);
+ gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (button),
+ GTK_ACCESSIBLE_RELATION_LABELLED_BY, gtk_widget_get_first_child (button), NULL);
g_object_unref (button);
}
diff --git a/testsuite/a11y/expander.c b/testsuite/a11y/expander.c
index 169898f796..07d605622b 100644
--- a/testsuite/a11y/expander.c
+++ b/testsuite/a11y/expander.c
@@ -31,15 +31,12 @@ expander_relations (void)
{
GtkWidget *widget = gtk_expander_new ("Hello");
GtkWidget *child = gtk_label_new ("Child");
- GList *list;
g_object_ref_sink (widget);
gtk_expander_set_child (GTK_EXPANDER (widget), child);
- list = g_list_append (NULL, child);
- gtk_test_accessible_assert_relation (widget, GTK_ACCESSIBLE_RELATION_CONTROLS, list);
- g_list_free (list);
+ gtk_test_accessible_assert_relation (widget, GTK_ACCESSIBLE_RELATION_CONTROLS, child, NULL);
g_object_unref (widget);
}
diff --git a/testsuite/a11y/general.c b/testsuite/a11y/general.c
index fe37d05632..c459b5029c 100644
--- a/testsuite/a11y/general.c
+++ b/testsuite/a11y/general.c
@@ -61,7 +61,6 @@ test_labelled_by (void)
{
GtkWidget *widget;
GtkWidget *label;
- GList *list;
widget = gtk_switch_new ();
g_object_ref_sink (widget);
@@ -72,9 +71,7 @@ test_labelled_by (void)
g_object_ref_sink (label);
gtk_widget_add_mnemonic_label (widget, label);
- list = g_list_append (NULL, label);
- gtk_test_accessible_assert_relation (widget, GTK_ACCESSIBLE_RELATION_LABELLED_BY, list);
- g_list_free (list);
+ gtk_test_accessible_assert_relation (widget, GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL);
g_object_unref (widget);
g_object_unref (label);
diff --git a/testsuite/a11y/label.c b/testsuite/a11y/label.c
index 3eba936bdf..5b6814af49 100644
--- a/testsuite/a11y/label.c
+++ b/testsuite/a11y/label.c
@@ -18,7 +18,6 @@ label_relations (void)
GtkWidget *label = gtk_label_new ("a");
GtkWidget *label2 = gtk_label_new ("b");
GtkWidget *entry = gtk_entry_new ();
- GList *list;
g_object_ref_sink (label);
g_object_ref_sink (label2);
@@ -28,16 +27,11 @@ label_relations (void)
gtk_widget_add_mnemonic_label (entry, label);
- list = g_list_append (NULL, label);
- gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_RELATION_LABELLED_BY, list);
- g_list_free (list);
+ gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL);
gtk_widget_add_mnemonic_label (entry, label2);
- list = g_list_append (NULL, label);
- list = g_list_append (list, label2);
- gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_RELATION_LABELLED_BY, list);
- g_list_free (list);
+ gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, label2, NULL);
g_object_unref (entry);
g_object_unref (label);
diff --git a/testsuite/a11y/scrollbar.c b/testsuite/a11y/scrollbar.c
index 7120953151..c17ccb74ef 100644
--- a/testsuite/a11y/scrollbar.c
+++ b/testsuite/a11y/scrollbar.c
@@ -57,7 +57,6 @@ scrollbar_relations (void)
GtkWidget *hscrollbar;
GtkWidget *vscrollbar;
GtkWidget *child;
- GList *list;
g_object_ref_sink (sw);
@@ -70,10 +69,8 @@ scrollbar_relations (void)
child = gtk_text_view_new ();
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), child);
- list = g_list_append (NULL, child);
- gtk_test_accessible_assert_relation (hscrollbar, GTK_ACCESSIBLE_RELATION_CONTROLS, list);
- gtk_test_accessible_assert_relation (vscrollbar, GTK_ACCESSIBLE_RELATION_CONTROLS, list);
- g_list_free (list);
+ gtk_test_accessible_assert_relation (hscrollbar, GTK_ACCESSIBLE_RELATION_CONTROLS, child, NULL);
+ gtk_test_accessible_assert_relation (vscrollbar, GTK_ACCESSIBLE_RELATION_CONTROLS, child, NULL);
g_object_unref (sw);
}
diff --git a/testsuite/a11y/stack.c b/testsuite/a11y/stack.c
index 3f092c9f55..cfa01e229e 100644
--- a/testsuite/a11y/stack.c
+++ b/testsuite/a11y/stack.c
@@ -71,7 +71,6 @@ stack_relations (void)
GtkWidget *switcher = gtk_stack_switcher_new ();
GtkWidget *child;
GtkStackPage *page;
- GList *list;
g_object_ref_sink (stack);
g_object_ref_sink (switcher);
@@ -83,15 +82,11 @@ stack_relations (void)
child = gtk_widget_get_first_child (switcher);
page = gtk_stack_get_page (GTK_STACK (stack), child1);
- list = g_list_append (NULL, page);
- gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (child), GTK_ACCESSIBLE_RELATION_CONTROLS, list);
- g_list_free (list);
+ gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (child), GTK_ACCESSIBLE_RELATION_CONTROLS, page, NULL);
child = gtk_widget_get_last_child (switcher);
page = gtk_stack_get_page (GTK_STACK (stack), child2);
- list = g_list_append (NULL, page);
- gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (child), GTK_ACCESSIBLE_RELATION_CONTROLS, list);
- g_list_free (list);
+ gtk_test_accessible_assert_relation (GTK_ACCESSIBLE (child), GTK_ACCESSIBLE_RELATION_CONTROLS, page, NULL);
g_object_unref (stack);
g_object_unref (switcher);