projects
/
rodin
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Workaround for GtkBuilder bug in GTK 2.12
[rodin/chimara.git]
/
tests
/
glulxercise.c
diff --git
a/tests/glulxercise.c
b/tests/glulxercise.c
index 3c786a922655139250adfd95a00294328283b410..6d4b21fecce61d4efd35946a4e0aa56827be7f92 100644
(file)
--- a/
tests/glulxercise.c
+++ b/
tests/glulxercise.c
@@
-28,11
+28,14
@@
on_go_clicked(GtkButton *go, Widgets *w)
gtk_tree_model_get(model, &iter, 1, &filename, -1);
g_object_unref(model);
gtk_tree_model_get(model, &iter, 1, &filename, -1);
g_object_unref(model);
- if( !chimara_if_run_game(CHIMARA_IF(w->interp), filename, &error) )
+ 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();
}
{
error_dialog(GTK_WINDOW(w->window), error, "Error starting Glk library: ");
gtk_main_quit();
}
+ g_free(fullpath);
gtk_widget_set_sensitive(w->go, FALSE);
gtk_widget_set_sensitive(w->stop, TRUE);
gtk_widget_set_sensitive(w->go, FALSE);
gtk_widget_set_sensitive(w->stop, TRUE);
@@
-75,7
+78,7
@@
main(int argc, char *argv[])
gtk_init(&argc, &argv);
GtkBuilder *builder = gtk_builder_new();
gtk_init(&argc, &argv);
GtkBuilder *builder = gtk_builder_new();
- if(!gtk_builder_add_from_file(builder,
"
glulxercise.ui", &error))
+ if(!gtk_builder_add_from_file(builder,
PACKAGE_SRC_DIR "/
glulxercise.ui", &error))
{
error_dialog(NULL, error, "Failed to build interface: ");
return 1;
{
error_dialog(NULL, error, "Failed to build interface: ");
return 1;
@@
-85,6
+88,7
@@
main(int argc, char *argv[])
w->window = LOAD_WIDGET("window");
GtkWidget *vbox = LOAD_WIDGET("vbox");
w->test_picker = LOAD_WIDGET("test_picker");
w->window = LOAD_WIDGET("window");
GtkWidget *vbox = LOAD_WIDGET("vbox");
w->test_picker = LOAD_WIDGET("test_picker");
+ gtk_combo_box_set_active(GTK_COMBO_BOX(w->test_picker), 0);
w->go = LOAD_WIDGET("go");
w->stop = LOAD_WIDGET("stop");
w->interp = chimara_if_new();
w->go = LOAD_WIDGET("go");
w->stop = LOAD_WIDGET("stop");
w->interp = chimara_if_new();