From 9bf66139b134c5af33de072078dd3227e36f3534 Mon Sep 17 00:00:00 2001 From: btb Date: Sun, 18 Jan 2009 08:36:13 +0000 Subject: [PATCH] Conditional compilation for Maemo-only features git-svn-id: svn+ssh://garage/var/lib/gforge/svnroot/maemo-mapper/trunk@241 6c538b50-5814-0410-93ad-8bdf4c0149d1 --- src/aprs.c | 6 +++++- src/settings.c | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/aprs.c b/src/aprs.c index b242832..7753598 100644 --- a/src/aprs.c +++ b/src/aprs.c @@ -59,7 +59,11 @@ #include "display.h" #include "aprs.h" #include "gps.h" -#include "gpsbt.h" + +#ifdef HAVE_LIBGPSBT +# include "gpsbt.h" +#endif + #include "path.h" #include "util.h" diff --git a/src/settings.c b/src/settings.c index c429032..4e8176d 100644 --- a/src/settings.c +++ b/src/settings.c @@ -304,11 +304,13 @@ void add_edit_box(GtkWidget *table, gint xmin, gint xmax, gint ymin, gint ymax, *ctrl = gtk_entry_new(), TRUE, TRUE, 0); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(*ctrl), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(*ctrl), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif //set_ctrl_alignment(*ctrl, alignment); @@ -3307,11 +3309,13 @@ void setup_aprs_inet2_options_page(GtkWidget *notebook, TAprsSettings *aprsSetti aprsSettings->txt_aprs_inet_beacon_interval = gtk_entry_new(), TRUE, TRUE, 0); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(aprsSettings->txt_aprs_inet_beacon_interval), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(aprsSettings->txt_aprs_inet_beacon_interval), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif gtk_table_attach(GTK_TABLE(table), @@ -3334,11 +3338,13 @@ void setup_aprs_inet2_options_page(GtkWidget *notebook, TAprsSettings *aprsSetti aprsSettings->txt_aprs_inet_beacon_comment = gtk_entry_new(), TRUE, TRUE, 0); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(aprsSettings->txt_aprs_inet_beacon_comment), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(aprsSettings->txt_aprs_inet_beacon_comment), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif // Init values -- 2.44.0