X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=tests%2Fglulxercise.c;h=3f3b3933bcdef15ca33a4c0ee6e41cf7781fac51;hp=a389d8948d0a16b857b04767c9e6826e7945b731;hb=1cf1a0b599423e4c8960f2021bceb90e85d4695c;hpb=224e54373b084f5246e19abebb7e9a6337798918 diff --git a/tests/glulxercise.c b/tests/glulxercise.c index a389d89..3f3b393 100644 --- a/tests/glulxercise.c +++ b/tests/glulxercise.c @@ -1,7 +1,6 @@ #include #include #include -#include "error.h" #define LOAD_WIDGET(name) GTK_WIDGET(gtk_builder_get_object(builder, name)) @@ -9,6 +8,13 @@ typedef struct { GtkWidget *window, *test_picker, *go, *stop, *interp; } Widgets; +gboolean +on_window_delete_event() +{ + gtk_main_quit(); + return TRUE; +} + void on_go_clicked(GtkButton *go, Widgets *w) { @@ -24,10 +30,7 @@ on_go_clicked(GtkButton *go, Widgets *w) gchar *fullpath = g_build_filename(PACKAGE_SRC_DIR, filename, NULL); if( !chimara_if_run_game(CHIMARA_IF(w->interp), fullpath, &error) ) - { - error_dialog(GTK_WINDOW(w->window), error, "Error starting Glk library: "); - gtk_main_quit(); - } + g_error("Error starting Glk library: %s", error->message); g_free(fullpath); } @@ -80,10 +83,7 @@ main(int argc, char *argv[]) GtkBuilder *builder = gtk_builder_new(); if(!gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/glulxercise.ui", &error)) - { - error_dialog(NULL, error, "Failed to build interface: "); - return 1; - } + g_error("Failed to build interface: %s", error->message); Widgets *w = g_slice_new0(Widgets); w->window = LOAD_WIDGET("window");