projects
/
rodin
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Verbeterd interrupt mechanisme en afbreken van het Glk programma
[rodin/chimara.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 1a1867f50357c398f3c6c323bd0fff74698a2937..8d561f4a8f2e841ba6297b6b54515466c9f02fba 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-42,6
+42,7
@@
#include "callbacks.h"
#include "error.h"
#include "event.h"
#include "callbacks.h"
#include "error.h"
#include "event.h"
+#include "abort.h"
#include "glk.h"
/*
#include "glk.h"
/*
@@
-66,8
+67,6
@@
# define N_(String) (String)
#endif
# define N_(String) (String)
#endif
-#include "callbacks.h"
-
/* The global builder object to be used to request handles to widgets */
GtkBuilder *builder = NULL;
/* 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();
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 ) {
/* 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();
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) );
g_thread_join(glk_thread);
g_object_unref( G_OBJECT(builder) );
- events_free();
return 0;
}
return 0;
}