[gnome-initial-setup] eula: Rearrange and rename

[Jasper St. Pierre <jstpierre src gnome org>]

commit b05d338e113450dc7eb3627352cf4bf195aeb3de
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Dec 14 15:06:49 2012 -0500

    eula: Rearrange and rename
    
    In preparation for markup.

 gnome-initial-setup/pages/eulas/gis-eula-pages.c |    2 +-
 gnome-initial-setup/pages/eulas/utils.c          |   48 +++++++++++-----------
 gnome-initial-setup/pages/eulas/utils.h          |    6 +-
 3 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/gnome-initial-setup/pages/eulas/gis-eula-pages.c b/gnome-initial-setup/pages/eulas/gis-eula-pages.c
index ce390e9..9987017 100644
--- a/gnome-initial-setup/pages/eulas/gis-eula-pages.c
+++ b/gnome-initial-setup/pages/eulas/gis-eula-pages.c
@@ -102,7 +102,7 @@ build_eula_text_buffer_plain_text (GFile   *file,
     goto error_out;
 
   buffer = gtk_text_buffer_new (NULL);
-  if (!splice_buffer (input_stream, buffer, &error))
+  if (!splice_buffer_text (input_stream, buffer, &error))
     goto error_out;
 
   /* monospace the text */
diff --git a/gnome-initial-setup/pages/eulas/utils.c b/gnome-initial-setup/pages/eulas/utils.c
index 4adda59..a4e8572 100644
--- a/gnome-initial-setup/pages/eulas/utils.c
+++ b/gnome-initial-setup/pages/eulas/utils.c
@@ -6,30 +6,6 @@
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 
-/* lifted from g_output_stream_splice */
-gboolean
-splice_buffer (GInputStream  *stream,
-               GtkTextBuffer *buffer,
-               GError       **error)
-{
-  char contents[8192];
-  gssize n_read;
-  GtkTextIter iter;
-
-  while (TRUE) {
-    n_read = g_input_stream_read (stream, contents, sizeof (contents), NULL, error);
-
-    /* error or eof */
-    if (n_read <= 0)
-      break;
-
-    gtk_text_buffer_get_end_iter (buffer, &iter);
-    gtk_text_buffer_insert (buffer, &iter, contents, n_read);
-  }
-
-  return (*error == NULL);
-}
-
 /* remove when this is landed in GTK+ itself */
 static GtkTextTag *
 text_buffer_get_text_tag_from_pango (PangoAttrIterator *paiter)
@@ -142,3 +118,27 @@ text_buffer_insert_pango_text (GtkTextBuffer *buffer,
   gtk_text_buffer_delete_mark (buffer, mark);
   pango_attr_iterator_destroy (paiter);
 }
+
+/* lifted from g_output_stream_splice */
+gboolean
+splice_buffer_text (GInputStream  *stream,
+                    GtkTextBuffer *buffer,
+                    GError       **error)
+{
+  char contents[8192];
+  gssize n_read;
+  GtkTextIter iter;
+
+  while (TRUE) {
+    n_read = g_input_stream_read (stream, contents, sizeof (contents), NULL, error);
+
+    /* error or eof */
+    if (n_read <= 0)
+      break;
+
+    gtk_text_buffer_get_end_iter (buffer, &iter);
+    gtk_text_buffer_insert (buffer, &iter, contents, n_read);
+  }
+
+  return (*error == NULL);
+}
diff --git a/gnome-initial-setup/pages/eulas/utils.h b/gnome-initial-setup/pages/eulas/utils.h
index dba5d2b..da7c873 100644
--- a/gnome-initial-setup/pages/eulas/utils.h
+++ b/gnome-initial-setup/pages/eulas/utils.h
@@ -7,9 +7,9 @@
 
 G_BEGIN_DECLS
 
-gboolean splice_buffer (GInputStream  *stream,
-                        GtkTextBuffer *buffer,
-                        GError       **error);
+gboolean splice_buffer_text (GInputStream  *stream,
+                             GtkTextBuffer *buffer,
+                             GError       **error);
 
 void text_buffer_insert_pango_text (GtkTextBuffer *buffer,
                                     GtkTextIter *iter,