Cleanup

[speedometer] / main.c

diff --git a/main.c b/main.c
index 3bd45f4..e67a164 100644 (file)
--- a/main.c
+++ b/main.c
@@ -30,6 +30,7 @@
 #define PROGNAME "org.wellu.speedometer"
 
 static AppData *appdata;
+static osso_context_t* osso_ctx;
 
 /* Requests delay from screen blanking
  * Should be called at least once in every 60 seconds
@@ -49,14 +50,14 @@ void init_app() {
        appdata->window = HILDON_WINDOW(hildon_window_new());
        hildon_program_add_window(appdata->program, appdata->window);
 
-       appdata->osso_ctx = osso_initialize(PROGNAME, "1.0", FALSE, NULL);
+       osso_ctx = osso_initialize(PROGNAME, "1.0", FALSE, NULL);
 
-       delay_display_blanking(appdata->osso_ctx);
-       g_timeout_add(55000, (GSourceFunc) delay_display_blanking, appdata->osso_ctx);
+       delay_display_blanking(osso_ctx);
+       g_timeout_add(55000, (GSourceFunc) delay_display_blanking, osso_ctx);
 }
 
 void deinit_app() {
-       osso_deinitialize(appdata->osso_ctx);
+       osso_deinitialize(osso_ctx);
        stop_gps(appdata);
 }
 
@@ -66,7 +67,7 @@ int main(int argc, char** argv) {
        init_app();
 
        // loads images from the disk to the image array
-       load_graphix(appdata);
+       load_graphics(appdata);
 
        // set display to 000
        set_digits_to_zero(appdata);