1 files changed, 16 insertions, 11 deletions

diff --git a/testsuite/gtk/composetable.c b/testsuite/gtk/composetable.c
index 26659bf9f9..0d0644932f 100644
--- a/testsuite/gtk/composetable.c
+++ b/testsuite/gtk/composetable.c
@@ -94,7 +94,9 @@ compose_table_match (void)
   char *file;
   guint16 buffer[8] = { 0, };
   gboolean finish, match, ret;
-  gunichar ch;
+  GString *output;
+
+  output = g_string_new ("");
 
   file = g_build_filename (g_test_get_dir (G_TEST_DIST), "compose", "match", NULL);
 
@@ -106,50 +108,53 @@ compose_table_match (void)
 
   buffer[0] = GDK_KEY_Multi_key;
   buffer[1] = 0;
-  ret = gtk_compose_table_check (table, buffer, 1, &finish, &match, &ch);
+  ret = gtk_compose_table_check (table, buffer, 1, &finish, &match, output);
   g_assert_true (ret);
   g_assert_false (finish);
   g_assert_false (match);
-  g_assert_true (ch == 0);
+  g_assert_true (output->len == 0);
 
   buffer[0] = GDK_KEY_a;
   buffer[1] = 0;
-  ret = gtk_compose_table_check (table, buffer, 1, &finish, &match, &ch);
+  ret = gtk_compose_table_check (table, buffer, 1, &finish, &match, output);
   g_assert_false (ret);
   g_assert_false (finish);
   g_assert_false (match);
-  g_assert_true (ch == 0);
+  g_assert_true (output->len == 0);
 
   buffer[0] = GDK_KEY_Multi_key;
   buffer[1] = GDK_KEY_s;
   buffer[2] = GDK_KEY_e;
-  ret = gtk_compose_table_check (table, buffer, 3, &finish, &match, &ch);
+  ret = gtk_compose_table_check (table, buffer, 3, &finish, &match, output);
   g_assert_true (ret);
   g_assert_false (finish);
   g_assert_false (match);
-  g_assert_true (ch == 0);
+  g_assert_true (output->len == 0);
 
   buffer[0] = GDK_KEY_Multi_key;
   buffer[1] = GDK_KEY_s;
   buffer[2] = GDK_KEY_e;
   buffer[3] = GDK_KEY_q;
-  ret = gtk_compose_table_check (table, buffer, 4, &finish, &match, &ch);
+  ret = gtk_compose_table_check (table, buffer, 4, &finish, &match, output);
   g_assert_true (ret);
   g_assert_false (finish);
   g_assert_true (match);
-  g_assert_true (ch == '!');
+  g_assert_cmpstr (output->str, ==, "!");
+
+  g_string_set_size (output, 0);
 
   buffer[0] = GDK_KEY_Multi_key;
   buffer[1] = GDK_KEY_s;
   buffer[2] = GDK_KEY_e;
   buffer[3] = GDK_KEY_q;
   buffer[4] = GDK_KEY_u;
-  ret = gtk_compose_table_check (table, buffer, 5, &finish, &match, &ch);
+  ret = gtk_compose_table_check (table, buffer, 5, &finish, &match, output);
   g_assert_true (ret);
   g_assert_true (finish);
   g_assert_true (match);
-  g_assert_true (ch == '?');
+  g_assert_cmpstr (output->str, ==, "?");
 
+  g_string_free (output, TRUE);
   g_free (file);
 }