aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Luc Beaudoin <pierre-luc@pierlux.com>2009-01-25 21:05:56 +0800
committerPierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>2009-06-01 23:35:31 +0800
commit3d23b14af82c996165a8eec628d841f463302f7c (patch)
tree3521ec5c50b0f871ad28a5e4769cd9222e0b6ec0
parentcab630a8ac359a8f44fdd30a5c3c128ef5d0916a (diff)
downloadgsoc2013-empathy-3d23b14af82c996165a8eec628d841f463302f7c.tar
gsoc2013-empathy-3d23b14af82c996165a8eec628d841f463302f7c.tar.gz
gsoc2013-empathy-3d23b14af82c996165a8eec628d841f463302f7c.tar.bz2
gsoc2013-empathy-3d23b14af82c996165a8eec628d841f463302f7c.tar.lz
gsoc2013-empathy-3d23b14af82c996165a8eec628d841f463302f7c.tar.xz
gsoc2013-empathy-3d23b14af82c996165a8eec628d841f463302f7c.tar.zst
gsoc2013-empathy-3d23b14af82c996165a8eec628d841f463302f7c.zip
Fix compilation if geoclue is not enabled
-rw-r--r--libempathy-gtk/empathy-location-manager.c8
-rw-r--r--src/empathy.c8
2 files changed, 9 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index c0595818e..de772c7e3 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -30,7 +30,6 @@
#if HAVE_GEOCLUE
#include <geoclue/geoclue-master.h>
-#endif
#include <extensions/extensions.h>
@@ -52,12 +51,12 @@ typedef struct {
MissionControl *mc;
GHashTable *location;
gpointer token;
-#if HAVE_GEOCLUE
+
GeoclueResourceFlags resources;
GeoclueMasterClient *gc_client;
GeocluePosition *gc_position;
GeoclueAddress *gc_address;
-#endif
+
gboolean reduce_accuracy;
gdouble reduce_value;
EmpathyAccountManager *account_manager;
@@ -68,7 +67,6 @@ static void location_manager_get_property (GObject *object, guint param_id,
GValue *value, GParamSpec *pspec);
static void location_manager_set_property (GObject *object, guint param_id,
const GValue *value, GParamSpec *pspec);
-#if HAVE_GEOCLUE
static void position_changed_cb (GeocluePosition *position,
GeocluePositionFields fields, int timestamp, double latitude,
double longitude, double altitude, GeoclueAccuracy *accuracy,
@@ -83,7 +81,6 @@ static void resource_cb (EmpathyConf *conf, const gchar *key,
gpointer user_data);
static void accuracy_cb (EmpathyConf *conf, const gchar *key,
gpointer user_data);
-#endif
static void account_connection_changed_cb (EmpathyAccountManager *manager,
McAccount *account, TpConnectionStatusReason reason,
TpConnectionStatus current, TpConnectionStatus previous,
@@ -293,7 +290,6 @@ update_timestamp (EmpathyLocationManager *location_manager,
DEBUG ("\t - Timestamp: %" G_GINT64_FORMAT, stamp64);
}
-#if HAVE_GEOCLUE
static void
initial_position_cb (GeocluePosition *position,
GeocluePositionFields fields,
diff --git a/src/empathy.c b/src/empathy.c
index 66bb2c119..60c250838 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -422,7 +422,9 @@ int
main (int argc, char *argv[])
{
guint32 startup_timestamp;
- EmpathyLocationManager *location_manager;
+#if HAVE_GEOCLUE
+ EmpathyLocationManager *location_manager = NULL;
+#endif
EmpathyStatusIcon *icon;
EmpathyDispatcher *dispatcher;
EmpathyLogManager *log_manager;
@@ -585,7 +587,9 @@ main (int argc, char *argv[])
G_CALLBACK (new_call_handler_cb), NULL);
/* Location mananger */
+#if HAVE_GEOCLUE
location_manager = empathy_location_manager_get_default ();
+#endif
gtk_main ();
@@ -598,7 +602,9 @@ main (int argc, char *argv[])
g_object_unref (dispatcher);
g_object_unref (chatroom_manager);
g_object_unref (ft_manager);
+#if HAVE_GEOCLUE
g_object_unref (location_manager);
+#endif
notify_uninit ();