X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=8d561f4a8f2e841ba6297b6b54515466c9f02fba;hb=5292406311d31682a850baf059cab01a6f0262b2;hp=1a1867f50357c398f3c6c323bd0fff74698a2937;hpb=2baac1a1aa285bc52da8feb92433144a1e50bcce;p=rodin%2Fchimara.git diff --git a/src/main.c b/src/main.c index 1a1867f..8d561f4 100644 --- a/src/main.c +++ b/src/main.c @@ -42,6 +42,7 @@ #include "callbacks.h" #include "error.h" #include "event.h" +#include "abort.h" #include "glk.h" /* @@ -66,8 +67,6 @@ # define N_(String) (String) #endif -#include "callbacks.h" - /* The global builder object to be used to request handles to widgets */ GtkBuilder *builder = NULL; @@ -130,6 +129,7 @@ main(int argc, char *argv[]) gtk_widget_show(window); events_init(); + interrupt_init(); /* In een aparte thread of proces */ if( (glk_thread = g_thread_create(glk_enter, NULL, TRUE, &error)) == NULL ) { @@ -142,11 +142,10 @@ main(int argc, char *argv[]) gtk_main(); gdk_threads_leave(); - event_throw(EVENT_TYPE_QUIT, NULL, 0, 0); + signal_abort(); g_thread_join(glk_thread); g_object_unref( G_OBJECT(builder) ); - events_free(); return 0; }