[nautilus-actions] Obsoletes g_type_init() starting with glib 2.36

[Pierre Wieser <pwieser src gnome org>]

commit e5c78178e7351da7c371a2ac999a82a2610001d7
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat Sep 7 16:25:55 2013 +0200

    Obsoletes g_type_init() starting with glib 2.36

 ChangeLog                             |   18 ++++++++++++++++++
 src/nact/base-application.c           |    2 ++
 src/test/test-iface.c                 |    2 ++
 src/test/test-iface2.c                |    2 ++
 src/test/test-module.c                |    4 ++++
 src/test/test-parse-uris.c            |    3 +++
 src/test/test-reader.c                |    2 ++
 src/test/test-virtuals-without-test.c |    2 ++
 src/test/test-virtuals.c              |    2 ++
 src/utils/na-delete-xmltree.c         |    3 +++
 src/utils/na-print-schemas.c          |    3 +++
 src/utils/na-set-conf.c               |    3 +++
 src/utils/nautilus-actions-new.c      |    3 +++
 src/utils/nautilus-actions-print.c    |    3 +++
 src/utils/nautilus-actions-run.c      |    3 +++
 15 files changed, 55 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c53462c..6f6a704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2013-09-07 Pierre Wieser <pwieser trychlos org>
+
+       * src/nact/base-application.c (g_type_init):
+       * src/test/test-iface.c (g_type_init):
+       * src/test/test-iface2.c (g_type_init):
+       * src/test/test-module.c (g_type_init):
+       * src/test/test-parse-uris.c (g_type_init):
+       * src/test/test-reader.c (g_type_init):
+       * src/test/test-virtuals-without-test.c (g_type_init):
+       * src/test/test-virtuals.c (g_type_init):
+       * src/utils/na-delete-xmltree.c (g_type_init):
+       * src/utils/na-print-schemas.c (g_type_init):
+       * src/utils/na-set-conf.c (g_type_init):
+       * src/utils/nautilus-actions-new.c (g_type_init):
+       * src/utils/nautilus-actions-print.c (g_type_init):
+       * src/utils/nautilus-actions-run.c (g_type_init):
+       Obsoletes g_type_init() starting with glib 2.36.
+
 2013-02-22 Pierre Wieser <pwieser trychlos org>
 
        * Allmost all files: Bump copyright year.
diff --git a/src/nact/base-application.c b/src/nact/base-application.c
index b79f8c8..8655166 100644
--- a/src/nact/base-application.c
+++ b/src/nact/base-application.c
@@ -151,7 +151,9 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
 
        type = g_type_register_static( G_TYPE_OBJECT, "BaseApplication", &info, 0 );
 
diff --git a/src/test/test-iface.c b/src/test/test-iface.c
index 6dc2050..9f8b1ba 100755
--- a/src/test/test-iface.c
+++ b/src/test/test-iface.c
@@ -42,7 +42,9 @@ main( int argc, char **argv )
        TestBase *base, *base2;
        TestDerived *derived;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
 
        g_debug( "allocating TestBase -------------------------------------" );
        base = test_base_new();
diff --git a/src/test/test-iface2.c b/src/test/test-iface2.c
index e63c208..b861f06 100755
--- a/src/test/test-iface2.c
+++ b/src/test/test-iface2.c
@@ -341,7 +341,9 @@ main( int argc, char **argv )
 {
        TestBase *base;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
 
        g_debug( "allocating TestBase -------------------------------------" );
        base = test_base_new();
diff --git a/src/test/test-module.c b/src/test/test-module.c
index 1fce73a..5ec7bab 100755
--- a/src/test/test-module.c
+++ b/src/test/test-module.c
@@ -57,7 +57,9 @@ main( int argc, char **argv )
 {
        GModule *module;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
 
        /* dynamically load the module */
        module = load_plugin();
@@ -346,7 +348,9 @@ main( int argc, char **argv )
 {
        NAModule *module;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
 
        /* dynamically load the module */
        module = load_plugin();
diff --git a/src/test/test-parse-uris.c b/src/test/test-parse-uris.c
index 728ef7c..75fa99e 100644
--- a/src/test/test-parse-uris.c
+++ b/src/test/test-parse-uris.c
@@ -51,7 +51,10 @@ main( int argc, char** argv )
 {
        int i;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
+
        g_printf( "URIs parsing test.\n\n" );
 
        for( i = 0 ; uris[i] ; ++i ){
diff --git a/src/test/test-reader.c b/src/test/test-reader.c
index 2c1db86..9ddafb8 100755
--- a/src/test/test-reader.c
+++ b/src/test/test-reader.c
@@ -67,7 +67,9 @@ main( int argc, char **argv )
        GList *import_results;
        NAImporterResult *result;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
 
        GOptionContext *context = init_options();
        check_options( argc, argv, context );
diff --git a/src/test/test-virtuals-without-test.c b/src/test/test-virtuals-without-test.c
index d2d7deb..1390187 100755
--- a/src/test/test-virtuals-without-test.c
+++ b/src/test/test-virtuals-without-test.c
@@ -560,7 +560,9 @@ main( int argc, char **argv )
        PwiFirstSecond *b;
        PwiFirstSecondThree *c;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
 
        a = g_object_new( PWI_FIRST_TYPE, NULL );
        b = g_object_new( PWI_FIRST_SECOND_TYPE, NULL );
diff --git a/src/test/test-virtuals.c b/src/test/test-virtuals.c
index 6ff7ede..2b3d0f8 100755
--- a/src/test/test-virtuals.c
+++ b/src/test/test-virtuals.c
@@ -445,7 +445,9 @@ main( int argc, char **argv )
        PwiSecond *b;
        PwiThree *c;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
 
        a = g_object_new( PWI_TYPE_FIRST, NULL );
        b = g_object_new( PWI_TYPE_SECOND, NULL );
diff --git a/src/utils/na-delete-xmltree.c b/src/utils/na-delete-xmltree.c
index e543fd6..eaac3ed 100644
--- a/src/utils/na-delete-xmltree.c
+++ b/src/utils/na-delete-xmltree.c
@@ -92,7 +92,10 @@ main( int argc, char** argv )
        gchar *help;
        gint errors;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
+
        setlocale( LC_ALL, "" );
        console_init_log_handler();
 
diff --git a/src/utils/na-print-schemas.c b/src/utils/na-print-schemas.c
index 032d268..e2f680d 100644
--- a/src/utils/na-print-schemas.c
+++ b/src/utils/na-print-schemas.c
@@ -91,7 +91,10 @@ main( int argc, char** argv )
        GSList *im;
        NADataGroup *full_action_groups = NULL;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
+
        setlocale( LC_ALL, "" );
        console_init_log_handler();
 
diff --git a/src/utils/na-set-conf.c b/src/utils/na-set-conf.c
index 5f4154a..710510a 100644
--- a/src/utils/na-set-conf.c
+++ b/src/utils/na-set-conf.c
@@ -99,7 +99,10 @@ main( int argc, char** argv )
        NAType type;
        gchar *msgerr;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
+
        setlocale( LC_ALL, "" );
        console_init_log_handler();
 
diff --git a/src/utils/nautilus-actions-new.c b/src/utils/nautilus-actions-new.c
index 2240902..6676e2e 100644
--- a/src/utils/nautilus-actions-new.c
+++ b/src/utils/nautilus-actions-new.c
@@ -178,7 +178,10 @@ main( int argc, char** argv )
        gchar *help;
        gint errors;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
+
        setlocale( LC_ALL, "" );
        console_init_log_handler();
 
diff --git a/src/utils/nautilus-actions-print.c b/src/utils/nautilus-actions-print.c
index 0580f88..e261f58 100644
--- a/src/utils/nautilus-actions-print.c
+++ b/src/utils/nautilus-actions-print.c
@@ -89,7 +89,10 @@ main( int argc, char** argv )
        NAObjectItem *item;
        NAIExporter *exporter;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
+
        setlocale( LC_ALL, "" );
        console_init_log_handler();
 
diff --git a/src/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
index efe0c9c..96c726b 100644
--- a/src/utils/nautilus-actions-run.c
+++ b/src/utils/nautilus-actions-run.c
@@ -92,7 +92,10 @@ main( int argc, char** argv )
        NAObjectProfile *profile;
        GList *targets;
 
+#if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
+#endif
+
        setlocale( LC_ALL, "" );
        console_init_log_handler();