Merged from trunk:

2007-11-22  Matthias Clasen  <mclasen@redhat.com>

        Merged from trunk:

        * tests/testrichtext.c (setup_buffer): Fix C89 compilation issue.
        (#467711, The Written Word)



svn path=/branches/gtk-2-12/; revision=19029
This commit is contained in:
Matthias Clasen
2007-11-22 06:15:04 +00:00
committed by Matthias Clasen
parent 6a13e3d82b
commit d6279caadd
2 changed files with 12 additions and 1 deletions

View File

@@ -1,3 +1,10 @@
2007-11-22 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
* tests/testrichtext.c (setup_buffer): Fix C89 compilation issue.
(#467711, The Written Word)
2007-11-22 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:

View File

@@ -64,12 +64,14 @@ setup_buffer (GtkTextBuffer *buffer)
{
const guint tlen = strlen (example_text);
const guint tcount = 17;
GtkTextTag *tags[tcount];
GtkTextTag **tags;
GtkTextTagTable *ttable = gtk_text_buffer_get_tag_table (buffer);
GSList *node, *slist = NULL;
GdkAtom atom;
guint i;
tags = g_malloc (sizeof (GtkTextTag *) * tcount);
/* cleanup */
gtk_text_buffer_set_text (buffer, "", 0);
gtk_text_tag_table_foreach (ttable, text_tag_enqueue, &slist);
@@ -104,6 +106,8 @@ setup_buffer (GtkTextBuffer *buffer)
atom = gtk_text_buffer_register_deserialize_tagset (buffer, NULL);
gtk_text_buffer_deserialize_set_can_create_tags (buffer, atom, TRUE);
g_free (tags);
return atom;
}