[Gpredict-svn] SF.net SVN: gpredict:[803] trunk

[<aa...@us...>]

Revision: 803
          http://gpredict.svn.sourceforge.net/gpredict/?rev=803&view=rev
Author:   aa1vs
Date:     2011-03-30 23:50:34 +0000 (Wed, 30 Mar 2011)

Log Message:
-----------
Change definition of HAS_LIBGPS.

Modified Paths:
--------------
    trunk/configure.ac
    trunk/src/qth-data.c
    trunk/src/qth-editor.c
    trunk/src/sat-pref-qth-editor.c
    trunk/src/sat-pref-qth.c

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2011-03-30 23:16:02 UTC (rev 802)
+++ trunk/configure.ac	2011-03-30 23:50:34 UTC (rev 803)
@@ -37,8 +37,6 @@
         AC_DEFINE(HAS_LIBGPS, 1, [Define if libgps is available])
    ], [
         havelibgps=false;            
-        AC_DEFINE(HAS_LIBGPS, 0, [Define if libgps is unvailable])
-
 ])
 
 dnl Hamlib not needed if we go for the TCP based I/F

Modified: trunk/src/qth-data.c
===================================================================
--- trunk/src/qth-data.c	2011-03-30 23:16:02 UTC (rev 802)
+++ trunk/src/qth-data.c	2011-03-30 23:50:34 UTC (rev 803)
@@ -40,7 +40,7 @@
 #include "orbit-tools.h"
 #include "time-tools.h"
 #include "locator.h"
-#if HAS_LIBGPS
+#ifdef HAS_LIBGPS
 #  include <gps.h>
 #endif
 
@@ -499,7 +499,7 @@
         }
 
         if (qth->gps_data!=NULL) {
-#if HAS_LIBGPS
+#ifdef HAS_LIBGPS
             switch (GPSD_API_MAJOR_VERSION){
             case 4:
 #if GPSD_API_MAJOR_VERSION==4
@@ -621,7 +621,7 @@
         /*nothing to do.  the data never updates*/
         break;
     case QTH_GPSD_TYPE:
-#if HAS_LIBGPS
+#ifdef HAS_LIBGPS
         switch (GPSD_API_MAJOR_VERSION) {
         case 4:
 #if GPSD_API_MAJOR_VERSION==4
@@ -696,7 +696,7 @@
 
             /* close gpsd socket */
             if (qth->gps_data !=NULL){
-#if HAS_LIBGPS
+#ifdef HAS_LIBGPS
                 switch (GPSD_API_MAJOR_VERSION) {
                 case 4:
                     gps_close(qth->gps_data);

Modified: trunk/src/qth-editor.c
===================================================================
--- trunk/src/qth-editor.c	2011-03-30 23:16:02 UTC (rev 802)
+++ trunk/src/qth-editor.c	2011-03-30 23:50:34 UTC (rev 803)
@@ -73,9 +73,11 @@
 static GtkWidget *location;       /* QTH location */
 static GtkWidget *desc;           /* QTH description */
 static GtkWidget *lat,*lon,*alt;  /* LAT, LON and ALT */
+#ifdef HAS_LIBGPS
 static GtkWidget *type;           /* GPSD type */
 static GtkWidget *server;         /* GPSD Server */
 static GtkWidget *port;           /* GPSD Port */
+#endif
 static GtkWidget *ns,*ew;
 
 static GtkWidget *qra;            /* QRA locator */
@@ -376,7 +378,7 @@
                       GUINT_TO_POINTER (SELECTION_MODE_WX));
     gtk_table_attach_defaults (GTK_TABLE (table), wxbut, 3, 4, 7, 8);
 
-#  if HAS_LIBGPS
+#  ifdef HAS_LIBGPS
      /* GPSD enabled*/
      label = gtk_label_new (_("QTH Type"));
      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -506,9 +508,11 @@
     const gchar      *qthdesc = NULL;
     const gchar      *qthwx = NULL;
     const gchar      *qthqra= NULL;
+#ifdef HAS_LIBGPS
     const gchar      *gpsdserver= NULL;
     guint       gpsdport;
     guint       gpsdenabled;
+#endif
     gdouble           qthlat;
     gdouble           qthlon;
     guint             qthalt;
@@ -533,9 +537,11 @@
     qthalt = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (alt));
     qthqra  = gtk_entry_get_text (GTK_ENTRY (qra));
     
+#ifdef HAS_LIBGPS
     gpsdenabled = gtk_combo_box_get_active ( GTK_COMBO_BOX (type) );
     gpsdserver = gtk_entry_get_text (GTK_ENTRY (server));
     gpsdport = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port));
+#endif
 
     /* clear qth struct if not empty */
     /*      if (qth->name != NULL) */
@@ -571,14 +577,18 @@
     if (qthqra != NULL)
         qth->qra = g_strdup (qthqra);
 
+#ifdef HAS_LIBGPS
     if (gpsdserver != NULL)
         qth->gpsd_server = g_strdup (gpsdserver);
-
+#endif
     qth->lat = qthlat;
     qth->lon = qthlon;
     qth->alt = qthalt;
+
+#ifdef HAS_LIBGPS
     qth->type = gpsdenabled;
     qth->gpsd_port = gpsdport;
+#endif
 
     /* store values */
     confdir = get_user_conf_dir ();

Modified: trunk/src/sat-pref-qth-editor.c
===================================================================
--- trunk/src/sat-pref-qth-editor.c	2011-03-30 23:16:02 UTC (rev 802)
+++ trunk/src/sat-pref-qth-editor.c	2011-03-30 23:50:34 UTC (rev 803)
@@ -80,9 +80,11 @@
 static GtkWidget *ns,*ew;
 
 static GtkWidget *qra;            /* QRA locator */
+#ifdef HAS_LIBGPS
 static GtkWidget *type;         /* GPSD type */
 static GtkWidget *server;         /* GPSD Server */
 static GtkWidget *port;           /* GPSD Port */
+#endif
 static gulong latsigid,lonsigid,nssigid,ewsigid,qrasigid;
 
 static GtkWidget *wx;             /* weather station */
@@ -361,7 +363,7 @@
                            GUINT_TO_POINTER (SELECTION_MODE_WX));
      gtk_table_attach_defaults (GTK_TABLE (table), wxbut, 3, 4, 7, 8);
 
-#  if HAS_LIBGPS
+#  ifdef HAS_LIBGPS
      /* GPSD enabled*/
      label = gtk_label_new (_("QTH Type"));
      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -468,11 +470,12 @@
                gtk_entry_set_text (GTK_ENTRY (wx), qthwx);
                g_free (qthwx);
           }
+#ifdef HAS_LIBGPS
           if (qthgpsdserver) {
                gtk_entry_set_text (GTK_ENTRY (server), qthgpsdserver);
                g_free (qthgpsdserver);
           }
-
+#endif
           if (qthlat < 0.00)
                gtk_combo_box_set_active (GTK_COMBO_BOX (ns), 1);
           else
@@ -488,8 +491,10 @@
           gtk_spin_button_set_value (GTK_SPIN_BUTTON (lon), fabs (qthlon));
 
           gtk_spin_button_set_value (GTK_SPIN_BUTTON (alt), qthalt);
+#ifdef HAS_LIBGPS
           gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), qthgpsdport);
           gtk_combo_box_set_active (GTK_COMBO_BOX (type), qthtype);
+#endif
 
           sat_log_log (SAT_LOG_LEVEL_DEBUG,
                           _("%s:%d: Loaded %s for editing:\n"\
@@ -560,7 +565,10 @@
      qthloc  = gtk_entry_get_text (GTK_ENTRY (location));
      qthdesc = gtk_entry_get_text (GTK_ENTRY (desc));
      qthwx   = gtk_entry_get_text (GTK_ENTRY (wx));
+
+#ifdef HAS_LIBGPS
      qthgpsdserver   = gtk_entry_get_text (GTK_ENTRY (server));
+#endif
 
      qthlat  = gtk_spin_button_get_value (GTK_SPIN_BUTTON (lat));
      if (gtk_combo_box_get_active (GTK_COMBO_BOX (ns)))
@@ -571,8 +579,11 @@
           qthlon = -qthlon;
 
      qthalt = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (alt));     
+
+#ifdef HAS_LIBGPS
      qthgpsdport = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port));     
      qthtype = gtk_combo_box_get_active ( GTK_COMBO_BOX (type));
+#endif
 
      /* get liststore */
      liststore = GTK_LIST_STORE (gtk_tree_view_get_model (treeview));

Modified: trunk/src/sat-pref-qth.c
===================================================================
--- trunk/src/sat-pref-qth.c	2011-03-30 23:16:02 UTC (rev 802)
+++ trunk/src/sat-pref-qth.c	2011-03-30 23:50:34 UTC (rev 803)
@@ -270,7 +270,7 @@
      g_signal_connect (qthlist, "row-activated", G_CALLBACK (row_activated_cb), NULL);
 
 
-#  if HAS_LIBGPS
+#  ifdef HAS_LIBGPS
      /* GPSD enabled*/
      /*server*/
      renderer = gtk_cell_renderer_text_new ();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.