From bb155a9fa3c8b940205ed787b730ccb5bedf14f6 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 6 Apr 2010 18:06:03 +0200 Subject: don't define update_geocode if geoclue is not enabled --- libempathy/empathy-contact.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libempathy/empathy-contact.c') diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 94d83b89d..9f40d8a8d 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -73,7 +73,9 @@ static void contact_get_property (GObject *object, guint param_id, static void contact_set_property (GObject *object, guint param_id, const GValue *value, GParamSpec *pspec); +#if HAVE_GEOCLUE static void update_geocode (EmpathyContact *contact); +#endif static void empathy_contact_set_location (EmpathyContact *contact, GHashTable *location); @@ -1162,7 +1164,9 @@ empathy_contact_set_location (EmpathyContact *contact, g_hash_table_unref (priv->location); priv->location = g_hash_table_ref (location); +#if HAVE_GEOCLUE update_geocode (contact); +#endif g_object_notify (G_OBJECT (contact), "location"); } @@ -1257,9 +1261,7 @@ geocode_cb (GeoclueGeocode *geocode, g_object_unref (geocode); g_object_unref (contact); } -#endif -#if HAVE_GEOCLUE static gchar * get_dup_string (GHashTable *location, gchar *key) @@ -1272,12 +1274,10 @@ get_dup_string (GHashTable *location, return NULL; } -#endif static void update_geocode (EmpathyContact *contact) { -#if HAVE_GEOCLUE static GeoclueGeocode *geocode; gchar *str; GHashTable *address; @@ -1348,5 +1348,5 @@ update_geocode (EmpathyContact *contact) geocode_cb, contact); g_hash_table_unref (address); -#endif } +#endif -- cgit v1.2.3