[Xfce4-commits] <xfconf:master> Drop deprecated function.

[Nick Schermer]

Updating branch refs/heads/master
         to 5719a34aad35eb1e91c595006c11d7b7978a0488 (commit)
       from ad34d1cd10c2df8568d02bcb4975d7c64ba3b6f6 (commit)

commit 5719a34aad35eb1e91c595006c11d7b7978a0488
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Jul 11 22:26:53 2013 +0200

    Drop deprecated function.

 xfconf-query/main.c |    3 +++
 xfconf/xfconf.c     |    2 ++
 xfconfd/main.c      |    3 +++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/xfconf-query/main.c b/xfconf-query/main.c
index fe09918..95c9200 100644
--- a/xfconf-query/main.c
+++ b/xfconf-query/main.c
@@ -240,7 +240,10 @@ main(int argc, char **argv)
 #endif
     xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
 
+#ifn GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
+
     if(!xfconf_init(&error))
     {
         xfconf_query_printerr(_("Failed to init libxfconf: %s"), error->message);
diff --git a/xfconf/xfconf.c b/xfconf/xfconf.c
index b412099..f7c0a5e 100644
--- a/xfconf/xfconf.c
+++ b/xfconf/xfconf.c
@@ -127,7 +127,9 @@ xfconf_init(GError **error)
         return TRUE;
     }
 
+#ifn GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
 
     xfconf_static_dbus_init();
 
diff --git a/xfconfd/main.c b/xfconfd/main.c
index e7cbf9e..de076e9 100644
--- a/xfconfd/main.c
+++ b/xfconfd/main.c
@@ -158,7 +158,10 @@ main(int argc,
     
     g_set_application_name(_("Xfce Configuration Daemon"));
     g_set_prgname(G_LOG_DOMAIN);
+
+#ifn GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
     
     opt_ctx = g_option_context_new(NULL);
     g_option_context_set_translation_domain(opt_ctx, PACKAGE);