geoclue: Disable deprecated g_type_init() when glib >= 2.35

2013-12-09 12:40:25 -05:00
parent e4034ba27d
commit 9e1457a248
1 changed files with 6 additions and 1 deletions
@@ -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;