From 9e1457a24844cb80cc3e200f08079eb0ecab1c3d Mon Sep 17 00:00:00 2001
From: Jon Lund Steffensen <jonlst@gmail.com>
Date: Mon, 9 Dec 2013 12:40:25 -0500
Subject: geoclue: Disable deprecated g_type_init() when glib >= 2.35

---
 src/location-geoclue.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/location-geoclue.c b/src/location-geoclue.c
index 6d33a59..5be651f 100644
--- a/src/location-geoclue.c
+++ b/src/location-geoclue.c
@@ -24,6 +24,9 @@
 #include <geoclue/geoclue-master.h>
 #include <geoclue/geoclue-position.h>
 
+#include <glib.h>
+#include <glib-object.h>
+
 #include "location-geoclue.h"
 
 #ifdef ENABLE_NLS
@@ -39,8 +42,10 @@
 int
 location_geoclue_init(location_geoclue_state_t *state)
 {
+#if !GLIB_CHECK_VERSION(2, 35, 0)
 	g_type_init();
-	
+#endif
+
 	state->position = NULL;
 	state->provider = NULL;
 	state->provider_path = NULL;
-- 
cgit v1.2.3-70-g09d2