From 4033847cb41a808b931d9a9ebbfba26b64416c7d Mon Sep 17 00:00:00 2001
From: michele <michele@itscold.(none)>
Date: Mon, 9 Nov 2009 23:12:29 +0100
Subject: [PATCH] fix typo, now autools works. also some minor mod for get
 type of fix

---
 Makefile.am     |    5 -----
 configure.ac    |    3 ---
 src/Makefile.am |    2 +-
 src/interface.c |    3 ++-
 src/loc_data.c  |   16 +++++++++-------
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2dab305..b836513 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,10 +13,5 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in 
-	#debian/changelog \
-	#debian/control \
-	#debian/copyright \
-	#debian/rules \
-	#debian/maemopad.links
 
 SUBDIRS = src 
diff --git a/configure.ac b/configure.ac
index 73167a0..d41033c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,4 @@ AC_DEFINE_UNQUOTED([PIXMAPDIR], "${pixmapdir}", [Runtime pixmap files path])
 AC_OUTPUT(
 	  Makefile \
 	  src/Makefile 
-	  #data/Makefile \
-	  #po/Makefile.in \
-	  #po/Makefile 
 )
diff --git a/src/Makefile.am b/src/Makefile.am
index aa5bfbc..752aca4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@
 
 bin_PROGRAMS = wai
 
-wai_LDADD = $(HILDON_LIBS) $(LILOCATION_LIBS)
+wai_LDADD = $(HILDON_LIBS) $(LIBLOCATION_LIBS)
 
 wai_CFLAGS= $(HILDON_CFLAGS) $(LIBLOCATION_CFLAGS) 
 
diff --git a/src/interface.c b/src/interface.c
index c1b4818..7fdade4 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -1,3 +1,4 @@
+
 #include "interface.h"
 #include <hildon/hildon.h>
 
@@ -97,7 +98,7 @@ create_ui()
     ui->longitude_value_label = lon_val_label;
     ui->altitude_value_label = alt_val_label;
     ui->speed_value_label = speed_val_label;
-//    ui->fix_status_label = fix_status_val_label;
+    ui->fix_status_label = fix_status_val_label;
     
     gtk_widget_show_all (main_win);
 
diff --git a/src/loc_data.c b/src/loc_data.c
index 3fe4cac..761d220 100644
--- a/src/loc_data.c
+++ b/src/loc_data.c
@@ -1,6 +1,6 @@
 #include "app_data.h"
 #include "loc_data.h"
-
+#include <stdio.h>
 void on_error(LocationGPSDControl *control, LocationGPSDControlError error, gpointer data)
 { 
 	g_debug("location error: %d... quitting", error);
@@ -9,14 +9,16 @@ void on_error(LocationGPSDControl *control, LocationGPSDControlError error, gpoi
 void on_changed(LocationGPSDevice *device, gpointer data)
 
 {    
+    printf("asd");
     if (!device)
         return;
-    
+
     if (device->fix) {
         if (device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET) {
             AppData *app_data = (AppData *) data;
             
             gchar *tmp_str = (gchar *) g_malloc (25);
+            gchar *no_data = "-";
             
             g_sprintf(tmp_str,"%f", device->fix->latitude);
             gtk_label_set_text( GTK_LABEL(app_data->main_ui->latitude_value_label), tmp_str );
@@ -27,12 +29,15 @@ void on_changed(LocationGPSDevice *device, gpointer data)
             if (device->fix->fields & LOCATION_GPS_DEVICE_ALTITUDE_SET) {
                 g_sprintf(tmp_str,"%f", device->fix->altitude);
                 gtk_label_set_text( GTK_LABEL(app_data->main_ui->altitude_value_label), tmp_str );
-            }
+            } else
+                gtk_label_set_text( GTK_LABEL(app_data->main_ui->altitude_value_label), no_data );
+            
 
             if (device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
                 g_sprintf(tmp_str,"%f", device->fix->speed);
                 gtk_label_set_text( GTK_LABEL(app_data->main_ui->speed_value_label), tmp_str );
-            }
+            } else
+                gtk_label_set_text( GTK_LABEL(app_data->main_ui->altitude_value_label), no_data );
             
             switch(device->fix->mode) {
             case LOCATION_GPS_DEVICE_MODE_NOT_SEEN:
@@ -51,11 +56,8 @@ void on_changed(LocationGPSDevice *device, gpointer data)
                 g_sprintf(tmp_str,"%s", "Bho");
             }
             
-
             gtk_label_set_text( GTK_LABEL(app_data->main_ui->fix_status_label), tmp_str );
             
-            g_debug("lat = %f, long = %f", device->fix->latitude, device->fix->longitude);
-
             g_free(tmp_str);
         }
     }
-- 
1.7.9.5