X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Fchimara-if.c;h=7b91830acdce059d12ab64193a28355cbf6c75df;hp=26e5b3a7626cc8f99520f5e0ae63ef28c9025fab;hb=7ef4ef1fecab7ae0f724e59f7de1315a96822152;hpb=57ceef742182d6f0d1f7844256863a37c2d80d6a

diff --git a/libchimara/chimara-if.c b/libchimara/chimara-if.c
index 26e5b3a..7b91830 100644
--- a/libchimara/chimara-if.c
+++ b/libchimara/chimara-if.c
@@ -166,27 +166,35 @@ chimara_if_set_property(GObject *object, guint prop_id, const GValue *value, GPa
     {
     	case PROP_PIRACY_MODE:
     		PROCESS_FLAG(priv->flags, CHIMARA_IF_PIRACY_MODE, g_value_get_boolean(value));
+    		g_object_notify(object, "piracy-mode");
     		break;
     	case PROP_TANDY_BIT:
     		PROCESS_FLAG(priv->flags, CHIMARA_IF_TANDY_BIT, g_value_get_boolean(value));
+    		g_object_notify(object, "tandy-bit");
     		break;
     	case PROP_EXPAND_ABBREVIATIONS:
     		PROCESS_FLAG(priv->flags, CHIMARA_IF_EXPAND_ABBREVIATIONS, g_value_get_boolean(value));
+    		g_object_notify(object, "expand-abbreviations");
     		break;
     	case PROP_IGNORE_ERRORS:
     		PROCESS_FLAG(priv->flags, CHIMARA_IF_IGNORE_ERRORS, g_value_get_boolean(value));
+    		g_object_notify(object, "ignore-errors");
     		break;
     	case PROP_TYPO_CORRECTION:
     		PROCESS_FLAG(priv->flags, CHIMARA_IF_TYPO_CORRECTION, g_value_get_boolean(value));
+    		g_object_notify(object, "typo-correction");
     		break;
     	case PROP_INTERPRETER_NUMBER:
     		priv->interpreter_number = g_value_get_uint(value);
+    		g_object_notify(object, "interpreter-number");
     		break;
     	case PROP_RANDOM_SEED:
     		priv->random_seed = g_value_get_int(value);
+    		g_object_notify(object, "random-seed");
     		break;
     	case PROP_RANDOM_SEED_SET:
     		priv->random_seed_set = g_value_get_boolean(value);
+    		g_object_notify(object, "random-seed-set");
     		break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -240,9 +248,16 @@ chimara_if_command(ChimaraIF *self, gchar *input, gchar *response)
 	/* Default signal handler */
 }
 
-/* G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */
+/* COMPAT: G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */
 #ifndef G_PARAM_STATIC_STRINGS
+
+/* COMPAT: G_PARAM_STATIC_NAME and friends only appeared in GTK 2.8 */
+#if GTK_CHECK_VERSION(2,8,0)
 #define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
+#else
+#define G_PARAM_STATIC_STRINGS (0)
+#endif
+
 #endif
 
 static void
@@ -264,8 +279,7 @@ chimara_if_class_init(ChimaraIFClass *klass)
 	 *
 	 * Emitted once for each input-response cycle of an interactive fiction
 	 * game. Note that games with nontraditional input systems (i.e. not all
-	 * taking place in the same text buffer window) may throw this signal for a
-	 * loop.
+	 * taking place in the same text buffer window) may confuse this signal.
 	 */
 	chimara_if_signals[COMMAND] = g_signal_new("command",
 		G_OBJECT_CLASS_TYPE(klass), 0,
@@ -535,12 +549,15 @@ chimara_if_run_game(ChimaraIF *self, gchar *gamefile, GError **error)
 
 	gchar *pluginpath;
 #ifdef DEBUG
+#ifndef LT_OBJDIR
+#define LT_OBJDIR ".libs" /* Pre-2.2 libtool, so take a wild guess */
+#endif /* LT_OBJDIR */
 	/* If there is a plugin in the source tree, use that */
 	pluginpath = g_build_filename(PLUGINSOURCEDIR, plugin_names[interpreter], LT_OBJDIR, pluginfile, NULL);
 	if( !g_file_test(pluginpath, G_FILE_TEST_EXISTS) )
 	{
 		g_free(pluginpath);
-#endif
+#endif /* DEBUG */
 		pluginpath = g_build_filename(PLUGINDIR, pluginfile, NULL);
 		if( !g_file_test(pluginpath, G_FILE_TEST_EXISTS) )
 		{