Lots of asserts in the code.

[speedometer] / util.c

diff --git a/util.c b/util.c
index 2d8c498..3c90f9f 100644 (file)
--- a/util.c
+++ b/util.c
@@ -32,6 +32,7 @@ static LocationGPSDControl *control = NULL;
 
 void start_gps(AppData* appdata) {
 #ifdef __arm__
+       g_assert(appdata);
        if(!device) {
                device = g_object_new(LOCATION_TYPE_GPS_DEVICE, NULL);
                g_signal_connect(device, "changed", G_CALLBACK(location_changed), appdata);
@@ -46,6 +47,7 @@ void start_gps(AppData* appdata) {
 
 void stop_gps(AppData* appdata) {
 #ifdef __arm__
+       g_assert(appdata);
        control = location_gpsd_control_get_default();
        location_gpsd_control_request_status(control);
        if(control->can_control) {
@@ -55,6 +57,7 @@ void stop_gps(AppData* appdata) {
 }
 
 void interpret_speed_from_gps(AppData* appdata, gdouble speed) {
+       g_assert(appdata);
 
        // if speed is below one then it's zero
        if(speed < 1) {
@@ -114,20 +117,19 @@ static show_dialog() {
                        "PO BOX\n"
                        "33580 Tampere\n"
                        "FINLAND");
-       gtk_dialog_run(dialog);
+       gtk_dialog_run(GTK_DIALOG(dialog));
        gtk_widget_destroy(dialog);
 }
 
-void show_postcard_dialog() {
+void show_cardware_dialog() {
        GConfClient* client = gconf_client_get_default();
        g_assert(GCONF_IS_CLIENT(client));
 
-
        GConfValue* gcvalue = NULL;
        gcvalue = gconf_client_get_without_default(client, GCONF_KEY, NULL);
 
        if(gcvalue == NULL) {
-               g_print("sjot");
+               g_print("GConf key not found so show dialog.");
                show_dialog();
                gconf_client_set_bool(client, GCONF_KEY, TRUE, NULL);
        }