From d8d094ddbe0fb9ab86ecd33f6cdd056d8b1ce9f2 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 2 Nov 2014 20:45:23 +0100
Subject: upload to ppa:x2go/stable+ppa
 (ubuntu/1.0.0-0ubuntu3+x2go1~0ubuntu14.04.1)

  * Non-maintainer upload.
  * Add SERVER_NAME env var support.
  * Add X2Go support to RLS.
  * Provide via ppa:x2go/ppa and ppa:x2go/stable on Launchpad.
---
 src/main.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index b6d56d4..74e09e0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,6 +33,7 @@
 #include "rdp-server.h"
 #include "citrix-server.h"
 #include "uccs-server.h"
+#include "x2go-server.h"
 #include "crypt.h"
 
 gint server_list_to_array (GVariantBuilder * builder, GList * items);
@@ -387,8 +388,10 @@ main (int argc, char * argv[])
 {
 	GError * error = NULL;
 
+#if !GLIB_CHECK_VERSION (2, 35, 1)
 	/* Init the GTypes */
 	g_type_init();
+#endif
 
 	/* Setup i18n */
 	setlocale (LC_ALL, ""); 
-- 
cgit v1.2.3