summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRaymond Penners <pennersr@src.gnome.org>2004-05-21 21:12:07 +0000
committerRaymond Penners <pennersr@src.gnome.org>2004-05-21 21:12:07 +0000
commitc8134c7fdac3226f70bcac2ceaec8c9c1af5e07d (patch)
treedeaca9017f74ffc228d13149caccbf3bf9d2f11a /modules
parent0a1f711eb09b8402a6855ac8d873925145365ff9 (diff)
downloadgtk+-c8134c7fdac3226f70bcac2ceaec8c9c1af5e07d.tar.gz
Patch 939583
Diffstat (limited to 'modules')
-rwxr-xr-xmodules/engines/ms-windows/ChangeLog.old7
-rwxr-xr-xmodules/engines/ms-windows/msw_style.c12
2 files changed, 17 insertions, 2 deletions
diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index 191a035dab..30ea5813e3 100755
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -1,3 +1,10 @@
+2004-05-21 Raymond Penners <raymond@dotsphinx.com>
+
+ * configure.in: Bump version number (0.6.0)
+
+ * src/msw_style.c: Applied patch by John Ehresman that fixes a
+ memory leak.
+
2004-05-21 Dom Lachowicz <cinamod@hotmail.com>
* src/Theme/gtk-2.0/gtkrc: Better icon sizes
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 8d72ab6d61..fdb6d58347 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -519,8 +519,16 @@ setup_system_font(GtkStyle *style)
{
char buf[256], * font; /* It's okay, lfFaceName is smaller than 32 chars */
- if ((font = sys_font_to_pango_font(XP_THEME_CLASS_TEXT, XP_THEME_FONT_MESSAGE, buf, sizeof (buf))) != NULL)
- style->font_desc = pango_font_description_from_string(font);
+ if ((font = sys_font_to_pango_font(XP_THEME_CLASS_TEXT,
+ XP_THEME_FONT_MESSAGE,
+ buf, sizeof (buf))) != NULL)
+ {
+ if (style->font_desc)
+ {
+ pango_font_description_free (style->font_desc);
+ }
+ style->font_desc = pango_font_description_from_string(font);
+ }
}
static void