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

diff --git a/src/aprs.c b/src/aprs.c
index b242832552688cfadadd4af479628ce81ae6af59..7753598eed609a80d02089f1191da27123c7ff0f 100644 (file)
--- a/src/aprs.c
+++ b/src/aprs.c
@@ -59,7 +59,11 @@
 #include "display.h"
 #include "aprs.h"
 #include "gps.h"
 #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"
 
 #include "path.h"
 #include "util.h"
 

diff --git a/src/settings.c b/src/settings.c
index c4290320a008ed24e310a4c060abaf1ce74f15b3..4e8176d32e1464ed725656141a974d9c889c5c10 100644 (file)
--- 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);
 
                *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);
 #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);
 #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);
 
         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);
 #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),
 #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);
 
         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);
 #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
 #endif
     
     // Init values