summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gtkutil.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 55a233adcd7..dd22c5388b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> (tiny change)
+
+ * gtkutil.c (xg_initialize): Add ifdef HAVE_FREETYPE around
+ x_last_font_name (Bug#13403).
+
2013-01-10 Dmitry Antipov <dmantipov@yandex.ru>
Omit buffer_slot_type_mismatch and use generic predicates to enforce
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 95ac04b8ff0..6daf189f74c 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -5041,7 +5041,9 @@ xg_initialize (void)
"cancel", 0);
update_theme_scrollbar_width ();
+#ifdef HAVE_FREETYPE
x_last_font_name = NULL;
+#endif
}
#endif /* USE_GTK */