Added changelog

[speedometer] / main.c

diff --git a/main.c b/main.c
index 782db74..e67a164 100644 (file)
--- a/main.c
+++ b/main.c
@@ -20,46 +20,72 @@
 #include <hildon/hildon-window.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
+#include <libosso.h>
 
 #include "callbacks.h"
 #include "appdata.h"
 #include "ui.h"
 #include "util.h"
 
-int main(int argc, char** argv) {
-
-       AppData *appdata = g_new0(AppData, 1);
-
-       gtk_init(&argc, &argv);
+#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
+ * we're not bothered about errors here as dbus calls
+ * either succeed or not. Worst case would be dimmed
+ * screen anyway.
+ */
+static gboolean delay_display_blanking(gpointer data) {
+       g_print("Requesting not to blank the screen in the next 60 secs.\n");
+       osso_display_blanking_pause(data);
+       return TRUE;
+}
 
+void init_app() {
+       appdata = g_new0(AppData, 1);
        appdata->program = HILDON_PROGRAM(hildon_program_get_instance());
        appdata->window = HILDON_WINDOW(hildon_window_new());
        hildon_program_add_window(appdata->program, appdata->window);
 
+       osso_ctx = osso_initialize(PROGNAME, "1.0", FALSE, NULL);
+
+       delay_display_blanking(osso_ctx);
+       g_timeout_add(55000, (GSourceFunc) delay_display_blanking, osso_ctx);
+}
+
+void deinit_app() {
+       osso_deinitialize(osso_ctx);
+       stop_gps(appdata);
+}
+
+int main(int argc, char** argv) {
+       gtk_init(&argc, &argv);
+
+       init_app();
+
        // loads images from the disk to the image array
-       load_graphix(appdata);
+       load_graphics(appdata);
 
        // set display to 000
-       load_initial_pixbufs(appdata);
+       set_digits_to_zero(appdata);
 
-       // create ui structure
+       // inits the ui placement
        create_ui(appdata);
 
-       // set the window fullscreen
-       gtk_window_fullscreen(GTK_WINDOW(appdata->window));
-
-       gtk_widget_show_all(GTK_WIDGET(appdata->window));
-
        g_thread_init(NULL);
 
        show_cardware_dialog();
 
-       //g_idle_add(randomize, appdata);
-
        start_gps(appdata);
 
        gtk_main();
 
+       // here we cleanup things
+       deinit_app();
+
        return EXIT_SUCCESS;
 }