[gjs] Drop g_type_init () calls, bump required GLib version



commit 274c4ff28b8b546fb2369cb4a881a5f7a9fd4f2a
Author: Colin Walters <walters verbum org>
Date:   Sun Oct 28 15:29:53 2012 -0400

    Drop g_type_init () calls, bump required GLib version
    
    See http://git.gnome.org/browse/glib/commit/?id=7c42ab23b55c43ab96d0ac2124b550bf1f49c1ec

 configure.ac            |    2 +-
 gjs-dbus/dbus-signals.c |    4 ----
 gjs-dbus/dbus.c         |    6 ------
 gjs/console.c           |    1 -
 gjs/stack.c             |    2 --
 test/gjs-tests.c        |    2 --
 test/gjs-unit.c         |    2 --
 7 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2a199f1..abe632c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ fi
 AM_CONDITIONAL([ENABLE_COVERAGE], [test x$enable_coverage = xyes])
 
 # Checks for libraries.
-m4_define(glib_required_version, 2.32.0)
+m4_define(glib_required_version, 2.35.0)
 
 AC_CHECK_HEADERS([malloc.h])
 AC_CHECK_FUNCS(mallinfo)
diff --git a/gjs-dbus/dbus-signals.c b/gjs-dbus/dbus-signals.c
index b8f3561..bac09f3 100644
--- a/gjs-dbus/dbus-signals.c
+++ b/gjs-dbus/dbus-signals.c
@@ -1174,8 +1174,6 @@ bigtest_test_func_util_dbus_signals_client(void)
 
     fork_test_signal_service();
 
-    g_type_init();
-
     /* We rely on the child-forking test functions being called first */
     g_assert(test_service_pid != 0);
 
@@ -1303,8 +1301,6 @@ do_test_service_child(void)
 {
     GMainLoop *loop;
 
-    g_type_init();
-
     loop = g_main_loop_new(NULL, FALSE);
 
     gjs_dbus_acquire_name(DBUS_BUS_SESSION,
diff --git a/gjs-dbus/dbus.c b/gjs-dbus/dbus.c
index 8a4e16a..3d22769 100644
--- a/gjs-dbus/dbus.c
+++ b/gjs-dbus/dbus.c
@@ -2534,8 +2534,6 @@ bigtest_test_func_util_dbus_client(void)
     fork_child_test_service();
     fork_child_test_io();
 
-    g_type_init();
-
     g_assert(test_service_pid != 0);
     g_assert(test_io_pid != 0);
 
@@ -2707,8 +2705,6 @@ do_test_service_child(void)
 {
     GMainLoop *loop;
 
-    g_type_init();
-
     loop = g_main_loop_new(NULL, FALSE);
 
     gjs_dbus_acquire_name(DBUS_BUS_SESSION,
@@ -2983,8 +2979,6 @@ do_test_io_child(void)
 {
     GMainLoop *loop;
 
-    g_type_init();
-
     loop = g_main_loop_new(NULL, FALSE);
 
     gjs_dbus_acquire_name(DBUS_BUS_SESSION,
diff --git a/gjs/console.c b/gjs/console.c
index 369e072..7da289d 100644
--- a/gjs/console.c
+++ b/gjs/console.c
@@ -62,7 +62,6 @@ main(int argc, char **argv)
         g_error("option parsing failed: %s", error->message);
 
     setlocale(LC_ALL, "");
-    g_type_init();
 
     command_line = g_strjoinv(" ", argv);
     g_free(command_line);
diff --git a/gjs/stack.c b/gjs/stack.c
index 8013e30..0117394 100644
--- a/gjs/stack.c
+++ b/gjs/stack.c
@@ -253,8 +253,6 @@ gjstest_test_func_gjs_stack_dump(void)
 {
   GjsContext *context;
 
-  g_type_init();
-
   /* TODO this test could be better - maybe expose dumpstack as a JS API
    * so that we have a JS stack to dump?  At least here we're getting some
    * coverage.
diff --git a/test/gjs-tests.c b/test/gjs-tests.c
index d73a7c5..ddd5734 100644
--- a/test/gjs-tests.c
+++ b/test/gjs-tests.c
@@ -36,8 +36,6 @@ int
 main(int    argc,
      char **argv)
 {
-    g_type_init ();
-
     gjs_crash_after_timeout(60*7); /* give the unit tests 7 minutes to complete */
 
     g_test_init(&argc, &argv, NULL);
diff --git a/test/gjs-unit.c b/test/gjs-unit.c
index 1ab9dda..b70a0da 100644
--- a/test/gjs-unit.c
+++ b/test/gjs-unit.c
@@ -252,8 +252,6 @@ main(int argc, char **argv)
     setlocale(LC_ALL, "");
     g_test_init(&argc, &argv, NULL);
 
-    g_type_init();
-
     /* iterate through all 'test*.js' files in ${top_srcdir}/test/js */
     js_test_dir = g_build_filename(top_srcdir, "test", "js", NULL);
 



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