Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara

Conflicts:
	libchimara/style.c

diff --cc libchimara/style.c
index 076d5363b4b77b9bb84761c180d383517e93f85f,02d9ab2d01300e1f5adda0cab6b57bdedc207561..125dbd6d38128c41032eba935b7a34a4c1d25ca7
--- 1/libchimara/style.c
--- 2/libchimara/style.c
+++ b/libchimara/style.c
@@@ -233,9 -239,12 +239,9 @@@ style_init(ChimaraGlk *glk
        GHashTable *glk_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
        GtkTextTag *tag;
  
 -      PangoFontDescription *default_font_desc = pango_font_description_from_string("Serif");
 -      PangoFontDescription *monospace_font_desc = pango_font_description_from_string("Monospace");
 -      
        /* Initialise the default styles for a text grid */
        tag = gtk_text_tag_new("default");
-       g_object_set(tag, "family", "Monospace", NULL);
+       g_object_set(tag, "family", "Monospace", "family-set", TRUE, NULL);
        g_hash_table_insert(default_text_grid_styles, "default", tag);
  
        tag = gtk_text_tag_new("normal");