[Xfce4-commits] <garcon:master> Fix deprecating warnings in tests.

Nick Schermer noreply at xfce.org
Sun May 5 18:34:01 CEST 2013


Updating branch refs/heads/master
         to bb6d1e9c12d31508985415317423a91c98dabecc (commit)
       from 2e9fe04180af50a829d01214ed707b292626d519 (commit)

commit bb6d1e9c12d31508985415317423a91c98dabecc
Author: Nick Schermer <nick at xfce.org>
Date:   Sun May 5 18:30:00 2013 +0200

    Fix deprecating warnings in tests.

 tests/test-menu-parser.c |    3 +++
 tests/test-menu-spec.c   |    2 ++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/tests/test-menu-parser.c b/tests/test-menu-parser.c
index 7e6beed..43138db 100644
--- a/tests/test-menu-parser.c
+++ b/tests/test-menu-parser.c
@@ -221,7 +221,10 @@ main (int    argc,
   gchar            *relative_filename;
   gint              result = EXIT_SUCCESS;
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
+  /* Initialize the type system */
   g_type_init ();
+#endif
 
 #if !GLIB_CHECK_VERSION(2,32,0)
   if (!g_thread_supported ())
diff --git a/tests/test-menu-spec.c b/tests/test-menu-spec.c
index ae0f2ea..ad27272 100644
--- a/tests/test-menu-spec.c
+++ b/tests/test-menu-spec.c
@@ -119,8 +119,10 @@ main (int    argc,
 
   g_set_prgname ("test-menu-spec");
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
   /* Initialize the type system */
   g_type_init ();
+#endif
 
   /* Try to get the root menu */
   menu = garcon_menu_new_applications ();


More information about the Xfce4-commits mailing list