gtktexttag: Move public members to private header

And fix gail to not poke at GtkTextTag internals

1 files changed, 24 insertions, 23 deletions

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index b07a04ec1f..c5124e7bd8 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -59,6 +59,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "gtktexttag.h"
+#include "gtktexttagprivate.h"
 #include "gtktexttagtable.h"
 #include "gtktextlayout.h"
 #include "gtktextiterprivate.h"
@@ -1778,7 +1779,7 @@ _gtk_text_btree_tag (const GtkTextIter *start_orig,
   g_return_if_fail (GTK_IS_TEXT_TAG (tag));
   g_return_if_fail (_gtk_text_iter_get_btree (start_orig) ==
                     _gtk_text_iter_get_btree (end_orig));
-  g_return_if_fail (tag->table == _gtk_text_iter_get_btree (start_orig)->table);
+  g_return_if_fail (tag->priv->table == _gtk_text_iter_get_btree (start_orig)->table);
   
 #if 0
   printf ("%s tag %s from %d to %d\n",
@@ -2505,10 +2506,10 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
           || (seg->type == &gtk_text_toggle_off_type))
         {
           tag = seg->body.toggle.info->tag;
-          if (tag->invisible_set)
+          if (tag->priv->invisible_set)
             {
-              tags[tag->priority] = tag;
-              tagCnts[tag->priority]++;
+              tags[tag->priv->priority] = tag;
+              tagCnts[tag->priv->priority]++;
             }
         }
     }
@@ -2529,10 +2530,10 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
               || (seg->type == &gtk_text_toggle_off_type))
             {
               tag = seg->body.toggle.info->tag;
-              if (tag->invisible_set)
+              if (tag->priv->invisible_set)
                 {
-                  tags[tag->priority] = tag;
-                  tagCnts[tag->priority]++;
+                  tags[tag->priv->priority] = tag;
+                  tagCnts[tag->priv->priority]++;
                 }
             }
         }
@@ -2558,10 +2559,10 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
               if (summary->toggle_count & 1)
                 {
                   tag = summary->info->tag;
-                  if (tag->invisible_set)
+                  if (tag->priv->invisible_set)
                     {
-                      tags[tag->priority] = tag;
-                      tagCnts[tag->priority] += summary->toggle_count;
+                      tags[tag->priv->priority] = tag;
+                      tagCnts[tag->priv->priority] += summary->toggle_count;
                     }
                 }
             }
@@ -2588,7 +2589,7 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
             }
 #endif
 #endif
-          invisible = tags[i]->values->invisible;
+          invisible = tags[i]->priv->values->invisible;
           break;
         }
     }
@@ -6798,7 +6799,7 @@ gtk_text_btree_node_check_consistency (GtkTextBTree     *tree,
                           break;
                         }
                       g_error ("gtk_text_btree_node_check_consistency: GtkTextBTreeNode tag \"%s\" not %s",
-                               summary->info->tag->name,
+                               summary->info->tag->priv->name,
                                "present in parent summaries");
                     }
                   if (summary->info == summary2->info)
@@ -6834,7 +6835,7 @@ gtk_text_btree_node_check_consistency (GtkTextBTree     *tree,
       if (summary->info->toggle_count == summary->toggle_count)
         {
           g_error ("gtk_text_btree_node_check_consistency: found unpruned root for \"%s\"",
-                   summary->info->tag->name);
+                   summary->info->tag->priv->name);
         }
       toggle_count = 0;
       if (node->level == 0)
@@ -6888,7 +6889,7 @@ gtk_text_btree_node_check_consistency (GtkTextBTree     *tree,
           if (summary2->info == summary->info)
             {
               g_error ("gtk_text_btree_node_check_consistency: duplicated GtkTextBTreeNode tag: %s",
-                       summary->info->tag->name);
+                       summary->info->tag->priv->name);
             }
         }
     }
@@ -6940,19 +6941,19 @@ _gtk_text_btree_check (GtkTextBTree *tree)
               if (info->toggle_count != 0)
                 {
                   g_error ("_gtk_text_btree_check found \"%s\" with toggles (%d) but no root",
-                           tag->name, info->toggle_count);
+                           tag->priv->name, info->toggle_count);
                 }
               continue;         /* no ranges for the tag */
             }
           else if (info->toggle_count == 0)
             {
               g_error ("_gtk_text_btree_check found root for \"%s\" with no toggles",
-                       tag->name);
+                       tag->priv->name);
             }
           else if (info->toggle_count & 1)
             {
               g_error ("_gtk_text_btree_check found odd toggle count for \"%s\" (%d)",
-                       tag->name, info->toggle_count);
+                       tag->priv->name, info->toggle_count);
             }
           for (summary = node->summary; summary != NULL;
                summary = summary->next)
@@ -7007,7 +7008,7 @@ _gtk_text_btree_check (GtkTextBTree *tree)
           if (count != info->toggle_count)
             {
               g_error ("_gtk_text_btree_check toggle_count (%d) wrong for \"%s\" should be (%d)",
-                       info->toggle_count, tag->name, count);
+                       info->toggle_count, tag->priv->name, count);
             }
         }
     }
@@ -7116,7 +7117,7 @@ _gtk_text_btree_spew (GtkTextBTree *tree)
         info = list->data;
 
         printf ("  tag `%s': root at %p, toggle count %d\n",
-                info->tag->name, info->tag_root, info->toggle_count);
+                info->tag->priv->name, info->tag_root, info->toggle_count);
 
         list = g_slist_next (list);
       }
@@ -7182,7 +7183,7 @@ _gtk_text_btree_spew_line_short (GtkTextLine *line, int indent)
                seg->type == &gtk_text_toggle_off_type)
         {
           printf ("%s tag `%s' %s\n",
-                  spaces, seg->body.toggle.info->tag->name,
+                  spaces, seg->body.toggle.info->tag->priv->name,
                   seg->type == &gtk_text_toggle_off_type ? "off" : "on");
         }
 
@@ -7209,7 +7210,7 @@ _gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent)
   while (s)
     {
       printf ("%s %d toggles of `%s' below this node\n",
-              spaces, s->toggle_count, s->info->tag->name);
+              spaces, s->toggle_count, s->info->tag->priv->name);
       s = s->next;
     }
 
@@ -7284,7 +7285,7 @@ _gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg)
            seg->type == &gtk_text_toggle_off_type)
     {
       printf ("       tag `%s' priority %d\n",
-              seg->body.toggle.info->tag->name,
-              seg->body.toggle.info->tag->priority);
+              seg->body.toggle.info->tag->priv->name,
+              seg->body.toggle.info->tag->priv->priority);
     }
 }