From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 24 Nov 2013 02:28:40 +0000 (-0500)
Subject: Fix warnings in a the actions test
X-Git-Tag: 2.39.2~109
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0250d185b1780691c02d746d0732ab94aeabd1ed;p=platform%2Fupstream%2Fglib.git

Fix warnings in a the actions test

The actions test tests the GSimpleActionGroup API. Maybe this
should be moved to use GActionMap, but for now, just disable
the deprecations.

There was also one test that wasn't actually hooked up, so
do that as well.
---

diff --git a/gio/tests/actions.c b/gio/tests/actions.c
index 8d165e4..36bbb5f 100644
--- a/gio/tests/actions.c
+++ b/gio/tests/actions.c
@@ -168,6 +168,8 @@ strv_set_equal (gchar **strv, ...)
   return res;
 }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 test_simple_group (void)
 {
@@ -238,6 +240,8 @@ test_simple_group (void)
   g_assert (!a.did_run);
 }
 
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 static void
 test_stateful (void)
 {
@@ -319,6 +323,8 @@ change_volume_state (GSimpleAction *action,
     g_simple_action_set_state (action, value);
 }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 test_entries (void)
 {
@@ -388,6 +394,8 @@ test_entries (void)
   g_object_unref (actions);
 }
 
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 static void
 test_parse_detailed (void)
 {
@@ -678,6 +686,8 @@ call_describe (gpointer user_data)
   return G_SOURCE_REMOVE;
 }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 test_dbus_export (void)
 {
@@ -879,6 +889,8 @@ test_dbus_threaded (void)
   session_bus_down ();
 }
 
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 static void
 test_bug679509 (void)
 {
@@ -1088,6 +1100,7 @@ main (int argc, char **argv)
   g_test_add_func ("/actions/parse-detailed", test_parse_detailed);
   g_test_add_func ("/actions/dbus/export", test_dbus_export);
   g_test_add_func ("/actions/dbus/threaded", test_dbus_threaded);
+  g_test_add_func ("/actions/dbus/bug679509", test_bug679509);
   g_test_add_func ("/actions/property", test_property_actions);
 
   return g_test_run ();