From: Dan Williams <dcbw@redhat.com>
Date: Mon, 26 Sep 2011 18:07:51 +0000 (-0500)
Subject: tests: fix generic closure marshalling tests
X-Git-Tag: 2.31.0~344
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a343904596a68458682da5707cc35fcc3ee7fa47;p=platform%2Fupstream%2Fglib.git

tests: fix generic closure marshalling tests

We're testing enums here, not flags, so we need to make sure
we're trying to send enums through the marshalling.

https://bugzilla.gnome.org/show_bug.cgi?id=659881
---

diff --git a/gobject/tests/signals.c b/gobject/tests/signals.c
index f283cd67c..864922feb 100644
--- a/gobject/tests/signals.c
+++ b/gobject/tests/signals.c
@@ -19,7 +19,7 @@ test_enum_get_type (void)
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
-      static const GFlagsValue values[] = {
+      static const GEnumValue values[] = {
         { TEST_ENUM_NEGATIVE, "TEST_ENUM_NEGATIVE", "negative" },
         { TEST_ENUM_NONE, "TEST_ENUM_NONE", "none" },
         { TEST_ENUM_FOO, "TEST_ENUM_FOO", "foo" },
@@ -27,7 +27,7 @@ test_enum_get_type (void)
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_flags_register_static (g_intern_static_string ("TestEnum"), values);
+        g_enum_register_static (g_intern_static_string ("TestEnum"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
@@ -41,13 +41,13 @@ test_unsigned_enum_get_type (void)
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
-      static const GFlagsValue values[] = {
+      static const GEnumValue values[] = {
         { TEST_UNSIGNED_ENUM_FOO, "TEST_UNSIGNED_ENUM_FOO", "foo" },
         { TEST_UNSIGNED_ENUM_BAR, "TEST_UNSIGNED_ENUM_BAR", "bar" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_flags_register_static (g_intern_static_string ("TestUnsignedEnum"), values);
+        g_enum_register_static (g_intern_static_string ("TestUnsignedEnum"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }