From: Marijn van Vliet <w.m.vanvliet@student.utwente.nl>
Date: Sun, 19 Jun 2011 10:29:03 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
X-Git-Tag: v0.9~73
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=973f25409470a04e2c1db8c4e5fc98f22144599a

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

Conflicts:
	libchimara/style.c
---

973f25409470a04e2c1db8c4e5fc98f22144599a
diff --cc libchimara/style.c
index 076d536,02d9ab2..125dbd6
--- a/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");