X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=callbacks.c;h=bb6dbdade47680181195c8ec2a56a49a2f156d5a;hb=HEAD;hp=59532525f38eed4882f4dcd644b24d493d1f7a68;hpb=8bd00384b1f1e9ac7d4a888d53aab0bfce6bd5f8;p=speedometer

diff --git a/callbacks.c b/callbacks.c
index 5953252..bb6dbda 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -14,25 +14,23 @@
 
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-****/
+ ****/
+
+#include <hildon/hildon-banner.h>
+#include <math.h>
+#include <glib.h>
 
 #include "callbacks.h"
 #include "appdata.h"
-
-// this is just here for debugging and tracing purposes
-static void print_location(LocationGPSDevice* device) {
-	g_print("Latitude: %.2f\n"
-			"Longitude: %.2f\n"
-			"Altitude: %.2f\n"
-			"Speed: %d",
-			device->fix->latitude,
-			device->fix->longitude,
-			device->fix->altitude,
-			device->fix->speed);
-}
-
-void location_changed(LocationGPSDevice* device, gpointer userdata) {
-
+#include "ui.h"
+
+void location_changed(LocationGPSDevice* device, gpointer data) {
+	// check for NaN before passing values
+	if(device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
+		if(!isnan(device->fix->speed)) {
+			interpret_and_set_speed(device->fix->speed);
+		}
+	}
 }
 
 gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, HildonWindow* window) {
@@ -77,29 +75,12 @@ gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, HildonWindow* windo
 	return FALSE;
 }
 
-gboolean top_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
-	gdouble x = event->x;
-	g_print("Top event box pressed at: %f\n", x);
-	AppData* appdata = (AppData*) data;
-
-	if(x > 750) {
-		g_print("Exiting..\n");
-		stop_gps(appdata);
-		g_signal_emit_by_name(appdata->window, "delete_event");
-	}
-	else {
-		randomize(appdata);
-	}
+gboolean long_tap(GtkWidget* widget, gpointer data) {
+	gtk_main_quit();
 	return TRUE;
 }
 
-
-gboolean bottom_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
-	gdouble x = event->x;
-	g_print("Bottom event box pressed at: %f\n", x);
-	AppData* appdata = (AppData*) data;
-
-	randomize(data);
+gboolean short_tap(GtkWidget* widget, GdkEventButton* event, gpointer data) {
+	change_unit();
 	return TRUE;
 }
-