summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--modules/basic/basic-win32.c5
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f905ae7..31e06b07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-13 Tor Lillqvist <tml@novell.com>
+
+ * modules/basic/basic-win32.c: Drop unused font_cache variable and
+ the call to pango_win32_font_map_for_display() used in its
+ initialization, which caused an extra instance of
+ PangoWin32FontMap to be created, and fonts enumerated an extra
+ time.
+
2005-09-12 Jean Brefort <jean.brefort@normalesup.org>
* pango/pango-attributes.c: (pango_attr_list_splice): Fixed typo
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index 9e068409..726b3e3f 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -70,8 +70,6 @@ static gboolean pango_win32_debug = FALSE;
static gboolean have_uniscribe = FALSE;
-static PangoWin32FontCache *font_cache;
-
static HDC hdc;
typedef HRESULT (WINAPI *pScriptGetProperties) (const SCRIPT_PROPERTIES ***,
@@ -1094,9 +1092,6 @@ init_uniscribe (void)
#ifdef BASIC_WIN32_DEBUGGING
(*script_get_properties) (&scripts, &nscripts);
#endif
- font_cache = pango_win32_font_map_get_font_cache
- (pango_win32_font_map_for_display ());
-
hdc = pango_win32_get_dc ();
}
#endif