Another one

diff --git a/ChangeLog b/ChangeLog
index e11f54691052c38d3ddf455268e3a90ca764402c..257a36c92bb4098a2539ad6db96ee06e2f9577c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2006-03-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktexttag.c (gtk_text_tag_get_property):
        * gtk/gtkcellrenderertext.c (gtk_cell_render_text_get_property):
        Avoid an unnecessary strdup.  (#336013)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e11f54691052c38d3ddf455268e3a90ca764402c..257a36c92bb4098a2539ad6db96ee06e2f9577c7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,6 @@
 2006-03-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktexttag.c (gtk_text_tag_get_property):
        * gtk/gtkcellrenderertext.c (gtk_cell_render_text_get_property):
        Avoid an unnecessary strdup.  (#336013)
 

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 41d691af881e07f04d48674079888c1197006712..d19831e502c7eb32b37461ac9777a4036010d679 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -1503,16 +1503,12 @@ gtk_text_tag_get_property (GObject      *object,
 
     case PROP_FONT:
         {
-          /* FIXME GValue imposes a totally gratuitous string copy
-           * here, we could just hand off string ownership
-           */
           gchar *str;
 
          gtk_text_tag_ensure_font (tag);
          
          str = pango_font_description_to_string (tag->values->font);
-          g_value_set_string (value, str);
-          g_free (str);
+          g_value_take_string (value, str);
         }
       break;