Merge branch 'master' of https://github.com/wmvanvliet/Chimara

[projects/chimara/chimara.git] / libchimara / garglk.c

diff --git a/libchimara/garglk.c b/libchimara/garglk.c
index 1a657ec81a9b4e3d642c6a63dae8f53d24208d7e..df5c6b35e4f0240289fa1c2bd983b3418ce51b0f 100644 (file)
--- a/libchimara/garglk.c
+++ b/libchimara/garglk.c
@@ -79,7 +79,6 @@ garglk_set_program_info(const char *info)
 void 
 garglk_set_story_name(const char *name)
 {
-       g_printerr("garglk_set_story_name(\"%s\");\n", name);
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
        glk_data->story_name = g_strdup(name);
        g_object_notify(G_OBJECT(glk_data->self), "story-name");
@@ -185,7 +184,11 @@ garglk_set_zcolors(glui32 fg, glui32 bg)
 static void
 apply_reverse_color(GtkTextTag *tag, gpointer data)
 {
-       g_object_set_data( G_OBJECT(tag), "reverse_color", data );
+       const gchar *tag_name;
+       g_object_get(tag, "name", &tag_name, NULL);
+
+       if( g_str_has_prefix(tag_name, "glk-") )
+               g_object_set_data( G_OBJECT(tag), "reverse_color", data );
 }
 
 /**
@@ -203,6 +206,7 @@ garglk_set_reversevideo(glui32 reverse)
        g_return_if_fail(glk_data->current_stream != NULL);
        g_return_if_fail(glk_data->current_stream->window != NULL);
 
-       GtkTextTagTable *tags = gtk_text_buffer_get_tag_table( GTK_TEXT_BUFFER(glk_data->current_stream->window->widget) );
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(glk_data->current_stream->window->widget) );
+       GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
        gtk_text_tag_table_foreach( tags, apply_reverse_color, GINT_TO_POINTER(reverse) );
 }