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

diff --git a/libchimara/garglk.c b/libchimara/garglk.c
index e7333a6d2bc1cfaa575b04c9665659bf978f47e3..19be50411658ffa8be46a17878c18238d1907f66 100644 (file)
--- a/libchimara/garglk.c
+++ b/libchimara/garglk.c
@@ -192,7 +192,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 );
 }
 
 /* TODO document */

diff --git a/libchimara/style.c b/libchimara/style.c
index 2e2b80c898c73fb54bd31aeccf3659dbf2d1157e..e9bfd888d5bcdcd29de79b1a736035a114432a96 100644 (file)
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -138,7 +138,7 @@ style_init_textbuffer(GtkTextBuffer *buffer)
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 
        /* Place the default text tags in the textbuffer's tag table */
-       g_hash_table_foreach(glk_data->styles->text_buffer, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
+       g_hash_table_foreach(glk_data->styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
 
        /* Copy the override text tags to the textbuffers's tag table */
        g_hash_table_foreach(glk_data->glk_styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
@@ -154,7 +154,7 @@ style_init_textgrid(GtkTextBuffer *buffer)
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 
        /* Place the default text tags in the textbuffer's tag table */
-       g_hash_table_foreach(glk_data->styles->text_grid, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
+       g_hash_table_foreach(glk_data->styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
 
        /* Copy the current text tags to the textbuffers's tag table */
        g_hash_table_foreach(glk_data->glk_styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));