diff options
| -rw-r--r-- | libempathy-gtk/empathy-contact-widget.c | 10 | ||||
| -rw-r--r-- | libempathy/empathy-contact.c | 8 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 4 | ||||
| -rw-r--r-- | src/empathy-preferences.c | 2 | ||||
| -rw-r--r-- | src/empathy.c | 10 |
5 files changed, 17 insertions, 17 deletions
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 4ff25b974..de958c32e 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -27,7 +27,7 @@ #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#if HAVE_LIBCHAMPLAIN +#ifdef HAVE_LIBCHAMPLAIN #include <champlain/champlain.h> #include <champlain-gtk/champlain-gtk.h> #endif @@ -107,7 +107,7 @@ typedef struct GtkWidget *subvbox_location; GtkWidget *table_location; GtkWidget *label_location; -#if HAVE_LIBCHAMPLAIN +#ifdef HAVE_LIBCHAMPLAIN GtkWidget *viewport_map; GtkWidget *map_view_embed; ChamplainView *map_view; @@ -1033,7 +1033,7 @@ contact_widget_location_update (EmpathyContactWidget *information) row++; } -#if HAVE_LIBCHAMPLAIN +#ifdef HAVE_LIBCHAMPLAIN if (has_position && !(information->flags & EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP)) { @@ -1055,7 +1055,7 @@ contact_widget_location_update (EmpathyContactWidget *information) return; } -#if HAVE_LIBCHAMPLAIN +#ifdef HAVE_LIBCHAMPLAIN if (display_map) { ClutterActor *marker; @@ -1868,7 +1868,7 @@ empathy_contact_widget_new (EmpathyContact *contact, "vbox_location", &information->vbox_location, "subvbox_location", &information->subvbox_location, "label_location", &information->label_location, -#if HAVE_LIBCHAMPLAIN +#ifdef HAVE_LIBCHAMPLAIN "viewport_map", &information->viewport_map, #endif "vbox_groups", &information->vbox_groups, diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index df8a1ffe4..e7286ac84 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -32,7 +32,7 @@ #include <folks/folks.h> #include <folks/folks-telepathy.h> -#if HAVE_GEOCLUE +#ifdef HAVE_GEOCLUE #include <geoclue/geoclue-geocode.h> #endif @@ -75,7 +75,7 @@ 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 +#ifdef HAVE_GEOCLUE static void update_geocode (EmpathyContact *contact); #endif @@ -1349,7 +1349,7 @@ empathy_contact_set_location (EmpathyContact *contact, g_hash_table_unref (priv->location); priv->location = g_hash_table_ref (location); -#if HAVE_GEOCLUE +#ifdef HAVE_GEOCLUE update_geocode (contact); #endif g_object_notify (G_OBJECT (contact), "location"); @@ -1392,7 +1392,7 @@ empathy_contact_equal (gconstpointer contact1, return FALSE; } -#if HAVE_GEOCLUE +#ifdef HAVE_GEOCLUE #define GEOCODE_SERVICE "org.freedesktop.Geoclue.Providers.Yahoo" #define GEOCODE_PATH "/org/freedesktop/Geoclue/Providers/Yahoo" diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 4aa5e4c9c..4aa38f5f4 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -940,7 +940,7 @@ static void main_window_view_show_map_cb (GtkCheckMenuItem *item, EmpathyMainWindow *window) { -#if HAVE_LIBCHAMPLAIN +#ifdef HAVE_LIBCHAMPLAIN empathy_map_view_show (); #endif } @@ -1600,7 +1600,7 @@ empathy_main_window_init (EmpathyMainWindow *window) g_object_ref (priv->ui_manager); g_object_unref (gui); -#if !HAVE_LIBCHAMPLAIN +#ifndef HAVE_LIBCHAMPLAIN gtk_action_set_visible (show_map_widget, FALSE); #endif diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index cf8a1748d..cf767a3ea 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -932,7 +932,7 @@ empathy_preferences_init (EmpathyPreferences *preferences) } page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), 3); -#if HAVE_GEOCLUE +#ifdef HAVE_GEOCLUE gtk_widget_show (page); #else gtk_widget_hide (page); diff --git a/src/empathy.c b/src/empathy.c index 091099201..28dd3e0fe 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -32,7 +32,7 @@ #include <gdk/gdkx.h> #include <unique/unique.h> -#if HAVE_LIBCHAMPLAIN +#ifdef HAVE_LIBCHAMPLAIN #include <clutter-gtk/clutter-gtk.h> #endif @@ -445,7 +445,7 @@ empathy_idle_set_auto_away_cb (GSettings *gsettings, int main (int argc, char *argv[]) { -#if HAVE_GEOCLUE +#ifdef HAVE_GEOCLUE EmpathyLocationManager *location_manager = NULL; #endif EmpathyStatusIcon *icon; @@ -489,7 +489,7 @@ main (int argc, char *argv[]) optcontext = g_option_context_new (N_("- Empathy IM Client")); g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); -#if HAVE_LIBCHAMPLAIN +#ifdef HAVE_LIBCHAMPLAIN g_option_context_add_group (optcontext, clutter_get_option_group ()); #endif g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE); @@ -593,7 +593,7 @@ main (int argc, char *argv[]) G_CALLBACK (new_incoming_transfer_cb), NULL); /* Location mananger */ -#if HAVE_GEOCLUE +#ifdef HAVE_GEOCLUE location_manager = empathy_location_manager_dup_singleton (); #endif @@ -613,7 +613,7 @@ main (int argc, char *argv[]) g_object_unref (log_manager); g_object_unref (dispatcher); g_object_unref (chatroom_manager); -#if HAVE_GEOCLUE +#ifdef HAVE_GEOCLUE g_object_unref (location_manager); #endif g_object_unref (ft_factory); |