GDK: Adapt to GLib thread api changes

[~andy/gtk] / gtk / gtktextbufferserialize.c

diff --git a/gtk/gtktextbufferserialize.c b/gtk/gtktextbufferserialize.c
index 526e9518aa9522ed3be4bea02ac8b07bb2095b5d..c750a80f0a2568db665d59aedd78ee4145873745 100644 (file)
--- a/gtk/gtktextbufferserialize.c
+++ b/gtk/gtktextbufferserialize.c
@@ -32,6 +32,7 @@
 
 #include "gdk-pixbuf/gdk-pixdata.h"
 #include "gtktextbufferserialize.h"
+#include "gtktexttagprivate.h"
 #include "gtkintl.h"
 
 
@@ -53,7 +54,7 @@ serialize_value (GValue *value)
 {
   if (g_value_type_transformable (value->g_type, G_TYPE_STRING))
     {
-      GValue text_value = { 0 };
+      GValue text_value = G_VALUE_INIT;
       gchar *tmp;
 
       g_value_init (&text_value, G_TYPE_STRING);
@@ -84,7 +85,7 @@ deserialize_value (const gchar *str,
 {
   if (g_value_type_transformable (G_TYPE_STRING, value->g_type))
     {
-      GValue text_value = { 0 };
+      GValue text_value = G_VALUE_INIT;
       gboolean retval;
 
       g_value_init (&text_value, G_TYPE_STRING);
@@ -292,9 +293,9 @@ serialize_tag (gpointer key,
   g_string_append (context->tag_table_str, "  <tag ");
 
   /* Handle anonymous tags */
-  if (tag->name)
+  if (tag->priv->name)
     {
-      tag_name = g_markup_escape_text (tag->name, -1);
+      tag_name = g_markup_escape_text (tag->priv->name, -1);
       g_string_append_printf (context->tag_table_str, "name=\"%s\"", tag_name);
       g_free (tag_name);
     }
@@ -305,14 +306,14 @@ serialize_tag (gpointer key,
       g_string_append_printf (context->tag_table_str, "id=\"%d\"", tag_id);
     }
 
-  g_string_append_printf (context->tag_table_str, " priority=\"%d\">\n", tag->priority);
+  g_string_append_printf (context->tag_table_str, " priority=\"%d\">\n", tag->priv->priority);
 
   /* Serialize properties */
   pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (tag), &n_pspecs);
 
   for (i = 0; i < n_pspecs; i++)
     {
-      GValue value = { 0 };
+      GValue value = G_VALUE_INIT;
       gchar *tmp, *tmp2;
 
       if (!(pspecs[i]->flags & G_PARAM_READABLE) ||
@@ -489,9 +490,9 @@ serialize_text (GtkTextBuffer        *buffer,
          /* Add it to the tag hash table */
          g_hash_table_insert (context->tags, tag, tag);
 
-         if (tag->name)
+         if (tag->priv->name)
            {
-             tag_name = g_markup_escape_text (tag->name, -1);
+             tag_name = g_markup_escape_text (tag->priv->name, -1);
 
              g_string_append_printf (context->text_str, "<apply_tag name=\"%s\">", tag_name);
              g_free (tag_name);
@@ -1163,7 +1164,7 @@ parse_attr_element (GMarkupParseContext  *context,
 {
   const gchar *name, *type, *value;
   GType gtype;
-  GValue gvalue = { 0 };
+  GValue gvalue = G_VALUE_INIT;
   GParamSpec *pspec;
 
   g_assert (peek_state (info) == STATE_TAG);
@@ -1481,10 +1482,10 @@ end_element_handler (GMarkupParseContext  *context,
       pop_state (info);
       g_assert (peek_state (info) == STATE_TAGS);
 
-      if (info->current_tag->name)
+      if (info->current_tag->priv->name)
        {
          /* Add tag to defined tags hash */
-         tmp = g_strdup (info->current_tag->name);
+         tmp = g_strdup (info->current_tag->priv->name);
          g_hash_table_insert (info->defined_tags,
                               tmp, tmp);
        }