[Xfce4-commits] <xfce4-terminal:master> Only call g_type_init on glib < 2.36.

[Nick Schermer]

Updating branch refs/heads/master
         to bff808b850866ef1dee06a822eeed55b8815e4a8 (commit)
       from 00855c9425d9e922fbf301bb30f3599ca41bf923 (commit)

commit bff808b850866ef1dee06a822eeed55b8815e4a8
Author: Nick Schermer <nick at xfce.org>
Date:   Sun May 5 20:12:54 2013 +0200

    Only call g_type_init on glib < 2.36.

 terminal/main.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/terminal/main.c b/terminal/main.c
index 6887f3e..93f8d40 100644
--- a/terminal/main.c
+++ b/terminal/main.c
@@ -236,8 +236,10 @@ main (int argc, char **argv)
     nargv[nargc++] = g_strdup (argv[n]);
   nargv[nargc] = NULL;
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
   /* for GDBus */
   g_type_init ();
+#endif
 
   if (!disable_server)
     {