[libpeas] Bump required glib version



commit 7f3d6413a3549be9de3792737312ff57654b48d4
Author: Garrett Regier <garrettregier gmail com>
Date:   Sat Dec 20 10:21:10 2014 -0800

    Bump required glib version
    
    Now we can remove the version checks
    for g_test_trap_subprocess().

 configure.ac                  |    2 +-
 tests/libpeas/engine.c        |    4 ----
 tests/libpeas/extension-lua.c |    4 ----
 tests/libpeas/extension-py.c  |    4 ----
 4 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ff7f09b..45293f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ dnl ================================================================
 
 PKG_PROG_PKG_CONFIG
 
-GLIB_REQUIRED=2.36.0
+GLIB_REQUIRED=2.38.0
 GOBJECT_REQUIRED=2.38.0
 GIO_REQUIRED=2.32.0
 INTROSPECTION_REQUIRED=1.39.0
diff --git a/tests/libpeas/engine.c b/tests/libpeas/engine.c
index 68dff08..995a2c8 100644
--- a/tests/libpeas/engine.c
+++ b/tests/libpeas/engine.c
@@ -401,7 +401,6 @@ test_engine_nonexistent_search_path (PeasEngine *engine)
   peas_engine_add_search_path (engine, "/nowhere", NULL);
 }
 
-#if GLIB_CHECK_VERSION (2, 38, 0)
 static void
 test_engine_shutdown (void)
 {
@@ -424,7 +423,6 @@ test_engine_shutdown_subprocess (PeasEngine *engine)
     engine = peas_engine_new ();
     g_assert (engine == NULL);
 }
-#endif
 
 int
 main (int    argc,
@@ -463,10 +461,8 @@ main (int    argc,
 
   TEST ("nonexistent-search-path", nonexistent_search_path);
 
-#if GLIB_CHECK_VERSION (2, 38, 0)
   TEST_FUNC ("shutdown", shutdown);
   TEST ("shutdown/subprocess", shutdown_subprocess);
-#endif
 
 #undef TEST
 
diff --git a/tests/libpeas/extension-lua.c b/tests/libpeas/extension-lua.c
index 6cfd97a..f8ae82b 100644
--- a/tests/libpeas/extension-lua.c
+++ b/tests/libpeas/extension-lua.c
@@ -148,7 +148,6 @@ test_extension_lua_activatable_subject_refcount (PeasEngine     *engine,
   set_garbage_collector_state (engine, info, TRUE);
 }
 
-#if GLIB_CHECK_VERSION (2, 38, 0)
 static void
 test_extension_lua_nonexistent (void)
 {
@@ -173,7 +172,6 @@ test_extension_lua_nonexistent_subprocess (PeasEngine *engine)
 
   g_assert (!peas_engine_load_plugin (engine, info));
 }
-#endif
 
 int
 main (int   argc,
@@ -204,10 +202,8 @@ main (int   argc,
   EXTENSION_TEST (lua5.1, "activatable-subject-refcount",
                   activatable_subject_refcount);
 
-#if GLIB_CHECK_VERSION (2, 38, 0)
   EXTENSION_TEST_FUNC (lua5.1, "nonexistent", nonexistent);
   EXTENSION_TEST (lua5.1, "nonexistent/subprocess", nonexistent_subprocess);
-#endif
 
   return testing_extension_run_tests ();
 }
diff --git a/tests/libpeas/extension-py.c b/tests/libpeas/extension-py.c
index b668558..f9ba5c8 100644
--- a/tests/libpeas/extension-py.c
+++ b/tests/libpeas/extension-py.c
@@ -106,7 +106,6 @@ test_extension_py_activatable_subject_refcount (PeasEngine     *engine,
   g_object_unref (object);
 }
 
-#if GLIB_CHECK_VERSION (2, 38, 0)
 static void
 test_extension_py_nonexistent (void)
 {
@@ -219,7 +218,6 @@ test_extension_py_mixed_python_subprocess (void)
   testing_engine_free (engine);
 }
 #endif
-#endif
 
 int
 main (int   argc,
@@ -250,7 +248,6 @@ main (int   argc,
   EXTENSION_TEST (PY_LOADER, "activatable-subject-refcount",
                   activatable_subject_refcount);
 
-#if GLIB_CHECK_VERSION (2, 38, 0)
   EXTENSION_TEST_FUNC (PY_LOADER, "nonexistent", nonexistent);
   EXTENSION_TEST (PY_LOADER, "nonexistent/subprocess",
                   nonexistent_subprocess);
@@ -264,7 +261,6 @@ main (int   argc,
   EXTENSION_TEST_FUNC (PY_LOADER, "mixed-python/subprocess",
                        mixed_python_subprocess);
 #endif
-#endif
 
   return testing_extension_run_tests ();
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]