unset the static_family flag so the family_name gets freed on the next

2001-09-20  Sven Neumann  <sven@gimp.org>

	* pango/fonts.c (pango_font_description_set_family,
	pango_font_description_copy): unset the static_family flag so the
	family_name gets freed on the next call.

8 files changed, 44 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 545d19ae..01381a67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_set_family,
+	pango_font_description_copy): unset the static_family flag so the
+	family_name gets freed on the next call.
+
 2001-09-20  James Henstridge  <james@daa.com.au>
 
 	* pango/Makefile.am (s-enum-types-c): fix rule so that flags get
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 545d19ae..01381a67 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,9 @@
+2001-09-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_set_family,
+	pango_font_description_copy): unset the static_family flag so the
+	family_name gets freed on the next call.
+
 2001-09-20  James Henstridge  <james@daa.com.au>
 
 	* pango/Makefile.am (s-enum-types-c): fix rule so that flags get
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 545d19ae..01381a67 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+2001-09-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_set_family,
+	pango_font_description_copy): unset the static_family flag so the
+	family_name gets freed on the next call.
+
 2001-09-20  James Henstridge  <james@daa.com.au>
 
 	* pango/Makefile.am (s-enum-types-c): fix rule so that flags get
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 545d19ae..01381a67 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+2001-09-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_set_family,
+	pango_font_description_copy): unset the static_family flag so the
+	family_name gets freed on the next call.
+
 2001-09-20  James Henstridge  <james@daa.com.au>
 
 	* pango/Makefile.am (s-enum-types-c): fix rule so that flags get
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 545d19ae..01381a67 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+2001-09-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_set_family,
+	pango_font_description_copy): unset the static_family flag so the
+	family_name gets freed on the next call.
+
 2001-09-20  James Henstridge  <james@daa.com.au>
 
 	* pango/Makefile.am (s-enum-types-c): fix rule so that flags get
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 545d19ae..01381a67 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+2001-09-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_set_family,
+	pango_font_description_copy): unset the static_family flag so the
+	family_name gets freed on the next call.
+
 2001-09-20  James Henstridge  <james@daa.com.au>
 
 	* pango/Makefile.am (s-enum-types-c): fix rule so that flags get
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 545d19ae..01381a67 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+2001-09-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_set_family,
+	pango_font_description_copy): unset the static_family flag so the
+	family_name gets freed on the next call.
+
 2001-09-20  James Henstridge  <james@daa.com.au>
 
 	* pango/Makefile.am (s-enum-types-c): fix rule so that flags get
diff --git a/pango/fonts.c b/pango/fonts.c
index 0d0569ef..cb997955 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -108,6 +108,7 @@ pango_font_description_set_family (PangoFontDescription *desc,
     {
       desc->family_name = g_strdup (family);
       desc->mask |= PANGO_FONT_MASK_FAMILY;
+      desc->static_family = FALSE;
     }
   else
     {
@@ -570,6 +571,7 @@ pango_font_description_copy  (const PangoFontDescription  *desc)
   *result = *desc;
 
   result->family_name = g_strdup (result->family_name);
+  result->static_family = FALSE;
 
   return result;
 }