Lots of asserts in the code.

git-svn-id: file:///svnroot/speedometer/trunk@35 df364472-da61-43ef-8a67-511c89aa921b

diff --git a/main.c b/main.c
index dd85ac2..44875cd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -52,7 +52,7 @@ int main(int argc, char** argv) {
 
        g_thread_init(NULL);
 
-       show_postcard_dialog();
+       show_cardware_dialog();
 
        //g_idle_add(randomize, appdata);
 

diff --git a/ui.c b/ui.c
index 44fd2c8..df4f4b9 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -24,6 +24,7 @@
 #define IMAGE_PATH "/usr/share/speedometer/%d.png"
 
 static void set_widget_bg_black(GtkWidget* widget) {
+       g_assert(widget);
        GdkColor black;
        black.red = 0x0000;
        black.blue = 0x0000;
@@ -32,6 +33,7 @@ static void set_widget_bg_black(GtkWidget* widget) {
 }
 
 void load_images(AppData *appdata) {
+       g_assert(appdata);
        g_print("Loading images\n");
        guint i = 0;
        while(i < 10) {
@@ -46,6 +48,7 @@ void load_images(AppData *appdata) {
 }
 
 void load_initial_pixbufs(AppData* appdata) {
+       g_assert(appdata);
 
        GdkPixbuf* zero = gtk_image_get_pixbuf(GTK_IMAGE(appdata->image_array[0]));
 
@@ -55,7 +58,9 @@ void load_initial_pixbufs(AppData* appdata) {
 }
 
 void set_nth_digit(AppData* appdata, guint n, guint value) {
-       //assert(nth >= 0 && nth < 3);
+       g_assert(appdata);
+       g_assert(value < 10);
+       g_assert(n < 3);
 
        GtkWidget* image = appdata->digit_array[n];
        GdkPixbuf* buf = gtk_image_get_pixbuf(GTK_IMAGE(appdata->image_array[value]));
@@ -63,13 +68,14 @@ void set_nth_digit(AppData* appdata, guint n, guint value) {
 }
 
 void repaint_all_digits(AppData* appdata) {
+       g_assert(appdata);
        gtk_widget_queue_draw(GTK_WIDGET(appdata->digit_array[0]));
        gtk_widget_queue_draw(GTK_WIDGET(appdata->digit_array[1]));
        gtk_widget_queue_draw(GTK_WIDGET(appdata->digit_array[2]));
 }
 
 void randomize(AppData* appdata) {
-
+       g_assert(appdata);
        gint32 n = g_random_int_range(0, 3);
        GtkWidget* image = appdata->digit_array[n];
 
@@ -83,7 +89,7 @@ void randomize(AppData* appdata) {
 }
 
 void create_ui(AppData* appdata) {
-
+       g_assert(appdata);
        GtkWidget *hbox;
        GtkWidget *vbox;
 

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);
        }

diff --git a/util.h b/util.h
index a7c5be6..95d7f13 100644 (file)
--- a/util.h
+++ b/util.h
@@ -31,6 +31,6 @@ void stop_gps(AppData* appdata);
 void interpret_speed_from_gps(AppData* appdata, gdouble speed);
 
 // shows instructions how to send me a postcard
-void show_postcard_dialog();
+void show_cardware_dialog();
 
 #endif /* UTIL_H_ */