From 4f62e0d1f26747924ed6eaad065265640d04ddb0 Mon Sep 17 00:00:00 2001
From: Remco Rijnders <remco@webconquest.com>
Date: Fri, 13 Feb 2015 11:41:57 +0100
Subject: [PATCH 18/18] Clean up compile time warnings on depreciated function
 g_type_init

---
 libAfterImage/import.c | 2 ++
 src/ASMount/main.c     | 8 ++++----
 src/afterstep/dbus.c   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libAfterImage/import.c b/libAfterImage/import.c
index f2c7ad1d..e2c0e6c7 100644
--- a/libAfterImage/import.c
+++ b/libAfterImage/import.c
@@ -2535,7 +2535,9 @@ svg2ASImage( const char * path, ASImageImportParams *params )
 	   several times or do we bork then? */
 	if (gType_inited == 0) 
 	{
+#ifndef GLIB_VERSION_2_36
 	   g_type_init();
+#endif
 	   gType_inited = 1;
 	}
  
diff --git a/src/ASMount/main.c b/src/ASMount/main.c
index 9a42b498..7811deff 100644
--- a/src/ASMount/main.c
+++ b/src/ASMount/main.c
@@ -1238,7 +1238,9 @@ void init_ASMount(ASFlagType flags, const char *cmd)
 	reloadButtons();
 	AppState.volumes = create_asbidirlist (ASVolume_destroy);
 
+#ifndef GLIB_VERSION_2_36
 	g_type_init();
+#endif
 	GVolumeMonitor * monitor  = g_volume_monitor_get();
 
 	g_signal_connect_object (monitor, "mount-added",    G_CALLBACK (mount_added), NULL, 0);
@@ -1477,12 +1479,10 @@ main (int argc, char *argv[])
  	LinkAfterStepConfig();
  	InitSession();
 
+#ifndef GLIB_VERSION_2_36
 	g_type_init();
-#if 0
-	ConnectXDisplay (gdk_x11_display_get_xdisplay(gdk_display_open(NULL)), NULL, False);
-#else	
-	ConnectX( ASDefaultScr, EnterWindowMask|PropertyChangeMask );
 #endif
+	ConnectX( ASDefaultScr, EnterWindowMask|PropertyChangeMask );
 	
 	ReloadASEnvironment( NULL, NULL, NULL, False, True );
 
diff --git a/src/afterstep/dbus.c b/src/afterstep/dbus.c
index 9cd24f10..3f344f1e 100644
--- a/src/afterstep/dbus.c
+++ b/src/afterstep/dbus.c
@@ -408,7 +408,7 @@ Bool get_gnome_autosave ()
 #ifdef HAVE_GIOLIB
 	static Bool g_types_inited = False;
 	if (!g_types_inited) {
-#if (GLIB_MAJOR_VERSION <= 2 && GLIB_MINOR_VERSION <= 35 && GLIB_MICRO_VERSION <= 0)
+#ifndef GLIB_VERSION_2_36
 		g_type_init ();
 #endif
 		g_types_inited = True;
-- 
2.22.0