Cleanup

[speedometer] / callbacks.c

diff --git a/callbacks.c b/callbacks.c
index 704f102..bb6dbda 100644 (file)
--- a/callbacks.c
+++ b/callbacks.c
@@ -14,10 +14,11 @@
 
        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"
@@ -28,7 +29,7 @@ void location_changed(LocationGPSDevice* device, gpointer data) {
        if(device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
                if(!isnan(device->fix->speed)) {
                        interpret_and_set_speed(device->fix->speed);
-                       }
+               }
        }
 }
 
@@ -74,30 +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) {
-       g_assert(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");
-               g_signal_emit_by_name(appdata->window, "delete_event");
-       }
+gboolean long_tap(GtkWidget* widget, gpointer data) {
+       gtk_main_quit();
        return TRUE;
 }
 
-gboolean middle_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
-       gdouble x = event->x;
-       g_print("Middle event box pressed at: %f\n", x);
-       g_print("TODO: change multiplier\n");
+gboolean short_tap(GtkWidget* widget, GdkEventButton* event, gpointer data) {
+       change_unit();
        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);
-       return TRUE;
-}
-