diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-07-08 18:09:54 +0800 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-05 22:37:06 +0800 |
| commit | 5cc326f741ab695e4fac8f4c4ccd99cf235115fc (patch) | |
| tree | 08cf9567bcd1b286f6526f70ab24f3fdb5ea411c /src | |
| parent | fd4fddb72a34a446b06068b0aeeba4e04b6f57c3 (diff) | |
| download | gsoc2013-empathy-5cc326f741ab695e4fac8f4c4ccd99cf235115fc.tar gsoc2013-empathy-5cc326f741ab695e4fac8f4c4ccd99cf235115fc.tar.gz gsoc2013-empathy-5cc326f741ab695e4fac8f4c4ccd99cf235115fc.tar.bz2 gsoc2013-empathy-5cc326f741ab695e4fac8f4c4ccd99cf235115fc.tar.lz gsoc2013-empathy-5cc326f741ab695e4fac8f4c4ccd99cf235115fc.tar.xz gsoc2013-empathy-5cc326f741ab695e4fac8f4c4ccd99cf235115fc.tar.zst gsoc2013-empathy-5cc326f741ab695e4fac8f4c4ccd99cf235115fc.zip | |
Use #ifdef instead of #if to avoid warnings of undefined symbols
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-main-window.c | 4 | ||||
| -rw-r--r-- | src/empathy-preferences.c | 2 | ||||
| -rw-r--r-- | src/empathy.c | 10 |
3 files changed, 8 insertions, 8 deletions
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); |