X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-if.c;h=ee91bf9e57e275b61ac1632d83bdadde310911bd;hb=HEAD;hp=cb0f425f012afd47c5382012ef765b560c901781;hpb=1c04c8a0a43723e3de4a7f495b76cb26fd93e0c4;p=rodin%2Fchimara.git diff --git a/libchimara/chimara-if.c b/libchimara/chimara-if.c index cb0f425..ee91bf9 100644 --- a/libchimara/chimara-if.c +++ b/libchimara/chimara-if.c @@ -6,6 +6,7 @@ #include #include "chimara-if.h" #include "chimara-glk.h" +#include "chimara-glk-private.h" #include "chimara-marshallers.h" #include "init.h" @@ -290,7 +291,7 @@ chimara_if_class_init(ChimaraIFClass *klass) chimara_if_signals[COMMAND] = g_signal_new("command", G_OBJECT_CLASS_TYPE(klass), 0, G_STRUCT_OFFSET(ChimaraIFClass, command), NULL, NULL, - chimara_marshal_VOID__STRING_STRING, + _chimara_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); /* Properties */ @@ -642,7 +643,14 @@ chimara_if_run_game(ChimaraIF *self, gchar *gamefile, GError **error) GSList *ptr; for(count = 0, ptr = args; ptr; count++, ptr = g_slist_next(ptr)) argv[count] = ptr->data; - + + /* Set the story name */ + /* We peek into ChimaraGlk's private data here, because GObject has no + equivalent to "protected" */ + CHIMARA_GLK_USE_PRIVATE(self, glk_priv); + glk_priv->story_name = g_path_get_basename(gamefile); + g_object_notify(G_OBJECT(self), "story-name"); + gboolean retval = chimara_glk_run(CHIMARA_GLK(self), pluginpath, argc, argv, error); g_free(argv); if(terpnumstr)