[gmime: 4/8] Renamed GMimeMultipart's preface/postface to prologue/epilogue

[Jeffrey Stedfast <fejj src gnome org>]

commit d1be1968f30b04571e055622acb6f2bf12d6de45
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Mon Apr 10 14:51:36 2017 -0400

    Renamed GMimeMultipart's preface/postface to prologue/epilogue

 PORTING                           |    4 ++
 docs/reference/changes-3.0.sgml   |    2 +
 docs/reference/gmime-sections.txt |    8 ++--
 gmime/gmime-multipart.c           |   64 ++++++++++++++++++------------------
 gmime/gmime-multipart.h           |   16 +++++-----
 gmime/gmime-parser.c              |   20 ++++++------
 6 files changed, 60 insertions(+), 54 deletions(-)
---
diff --git a/PORTING b/PORTING
index 6740374..8dee0a8 100644
--- a/PORTING
+++ b/PORTING
@@ -151,6 +151,10 @@ Porting from GMime 2.6 to GMime 3.0
 
 - Renamed GMimeFilterMd5 to GMimeFilterChecksum.
 
+- Renamed g_mime_multipart_[get,set]_preface() to g_mime_multipart_[get,set]_prologue().
+
+- Renamed g_mime_multipart_[get,set]_postface() to g_mime_multipart_[get,set]_epilogue().
+
 
 Porting from GMime 2.4 to GMime 2.6
 -----------------------------------
diff --git a/docs/reference/changes-3.0.sgml b/docs/reference/changes-3.0.sgml
index 24a53b1..a4c9e39 100644
--- a/docs/reference/changes-3.0.sgml
+++ b/docs/reference/changes-3.0.sgml
@@ -62,6 +62,8 @@
       <listitem><para><function>g_mime_parser_get_from_offset()</function> has been renamed to 
<function>g_mime_parser_get_mbox_marker_offset()</function>.</para></listitem>
       <listitem><para><function>g_mime_parser_construct_message()</function> and 
<function>g_mime_parser_construct_part()</function> now take a GMimeParserOptions argument.</para></listitem>
       <listitem><para>Renamed GMimeFilterMd5 to GMimeFilterChecksum.</para></listitem>
+      <listitem><para>Renamed <function>g_mime_multipart_get_preface</function> to 
<function>g_mime_multipart_get_prologue</function> and <function>g_mime_multipart_set_preface</function> to 
<function>g_mime_multipart_set_prologue</function>.</para></listitem>
+      <listitem><para>Renamed <function>g_mime_multipart_get_postface</function> to 
<function>g_mime_multipart_get_epilogue</function> and <function>g_mime_multipart_set_postface</function> to 
<function>g_mime_multipart_set_epilogue</function>.</para></listitem>
     </itemizedlist>
   </refsect1>
 </refentry>
diff --git a/docs/reference/gmime-sections.txt b/docs/reference/gmime-sections.txt
index 9918c1e..edb2cec 100644
--- a/docs/reference/gmime-sections.txt
+++ b/docs/reference/gmime-sections.txt
@@ -881,10 +881,10 @@ GMIME_TYPE_PART_ITER
 GMimeMultipart
 g_mime_multipart_new
 g_mime_multipart_new_with_subtype
-g_mime_multipart_set_preface
-g_mime_multipart_get_preface
-g_mime_multipart_set_postface
-g_mime_multipart_get_postface
+g_mime_multipart_set_prologue
+g_mime_multipart_get_prologue
+g_mime_multipart_set_epilogue
+g_mime_multipart_get_epilogue
 g_mime_multipart_set_boundary
 g_mime_multipart_get_boundary
 g_mime_multipart_get_count
diff --git a/gmime/gmime-multipart.c b/gmime/gmime-multipart.c
index 8c23cff..97519d3 100644
--- a/gmime/gmime-multipart.c
+++ b/gmime/gmime-multipart.c
@@ -126,8 +126,8 @@ g_mime_multipart_init (GMimeMultipart *multipart, GMimeMultipartClass *klass)
 {
        multipart->children = g_ptr_array_new ();
        multipart->write_end_boundary = TRUE;
-       multipart->preface = NULL;
-       multipart->postface = NULL;
+       multipart->prologue = NULL;
+       multipart->epilogue = NULL;
 }
 
 static void
@@ -136,8 +136,8 @@ g_mime_multipart_finalize (GObject *object)
        GMimeMultipart *multipart = (GMimeMultipart *) object;
        guint i;
        
-       g_free (multipart->preface);
-       g_free (multipart->postface);
+       g_free (multipart->prologue);
+       g_free (multipart->epilogue);
        
        for (i = 0; i < multipart->children->len; i++)
                g_object_unref (multipart->children->pdata[i]);
@@ -173,9 +173,9 @@ multipart_write_to_stream (GMimeObject *object, GMimeFormatOptions *options, gbo
                total += nwritten;
        }
        
-       /* write the preface */
-       if (multipart->preface) {
-               if ((nwritten = g_mime_stream_write_string (stream, multipart->preface)) == -1)
+       /* write the prologue */
+       if (multipart->prologue) {
+               if ((nwritten = g_mime_stream_write_string (stream, multipart->prologue)) == -1)
                        return -1;
                
                total += nwritten;
@@ -217,9 +217,9 @@ multipart_write_to_stream (GMimeObject *object, GMimeFormatOptions *options, gbo
                total += nwritten;
        }
        
-       /* write the postface */
-       if (multipart->postface) {
-               if ((nwritten = g_mime_stream_write_string (stream, multipart->postface)) == -1)
+       /* write the epilogue */
+       if (multipart->epilogue) {
+               if ((nwritten = g_mime_stream_write_string (stream, multipart->epilogue)) == -1)
                        return -1;
                
                total += nwritten;
@@ -287,70 +287,70 @@ g_mime_multipart_new_with_subtype (const char *subtype)
 
 
 /**
- * g_mime_multipart_set_preface:
+ * g_mime_multipart_set_prologue:
  * @multipart: a #GMimeMultipart object
- * @preface: preface
+ * @prologue: prologue
  *
- * Sets the preface on the multipart.
+ * Sets the prologue on the multipart.
  **/
 void
-g_mime_multipart_set_preface (GMimeMultipart *multipart, const char *preface)
+g_mime_multipart_set_prologue (GMimeMultipart *multipart, const char *prologue)
 {
        g_return_if_fail (GMIME_IS_MULTIPART (multipart));
        
-       g_free (multipart->preface);
-       multipart->preface = g_strdup (preface);
+       g_free (multipart->prologue);
+       multipart->prologue = g_strdup (prologue);
 }
 
 
 /**
- * g_mime_multipart_get_preface:
+ * g_mime_multipart_get_prologue:
  * @multipart: a #GMimeMultipart object
  *
- * Gets the preface on the multipart.
+ * Gets the prologue on the multipart.
  *
- * Returns: a pointer to the preface string on the multipart.
+ * Returns: a pointer to the prologue string on the multipart.
  **/
 const char *
-g_mime_multipart_get_preface (GMimeMultipart *multipart)
+g_mime_multipart_get_prologue (GMimeMultipart *multipart)
 {
        g_return_val_if_fail (GMIME_IS_MULTIPART (multipart), NULL);
        
-       return multipart->preface;
+       return multipart->prologue;
 }
 
 
 /**
- * g_mime_multipart_set_postface:
+ * g_mime_multipart_set_epilogue:
  * @multipart: a #GMimeMultipart object
- * @postface: postface
+ * @epilogue: epilogue
  *
- * Sets the postface on the multipart.
+ * Sets the epilogue on the multipart.
  **/
 void
-g_mime_multipart_set_postface (GMimeMultipart *multipart, const char *postface)
+g_mime_multipart_set_epilogue (GMimeMultipart *multipart, const char *epilogue)
 {
        g_return_if_fail (GMIME_IS_MULTIPART (multipart));
        
-       g_free (multipart->postface);
-       multipart->postface = g_strdup (postface);
+       g_free (multipart->epilogue);
+       multipart->epilogue = g_strdup (epilogue);
 }
 
 
 /**
- * g_mime_multipart_get_postface:
+ * g_mime_multipart_get_epilogue:
  * @multipart: a #GMimeMultipart object
  *
- * Gets the postface on the multipart.
+ * Gets the epilogue on the multipart.
  *
- * Returns: a pointer to the postface string on the multipart.
+ * Returns: a pointer to the epilogue string on the multipart.
  **/
 const char *
-g_mime_multipart_get_postface (GMimeMultipart *multipart)
+g_mime_multipart_get_epilogue (GMimeMultipart *multipart)
 {
        g_return_val_if_fail (GMIME_IS_MULTIPART (multipart), NULL);
        
-       return multipart->postface;
+       return multipart->epilogue;
 }
 
 
diff --git a/gmime/gmime-multipart.h b/gmime/gmime-multipart.h
index fa7d1c1..84f109b 100644
--- a/gmime/gmime-multipart.h
+++ b/gmime/gmime-multipart.h
@@ -44,8 +44,8 @@ typedef struct _GMimeMultipartClass GMimeMultipartClass;
  * @parent_object: parent #GMimeObject
  * @children: array of MIME sub-parts
  * @boundary: MIME boundary
- * @preface: multipart preface
- * @postface: multipart postface
+ * @prologue: multipart prologue
+ * @epilogue: multipart epilogue
  *
  * A base MIME multipart object.
  **/
@@ -54,8 +54,8 @@ struct _GMimeMultipart {
        
        GPtrArray *children;
        char *boundary;
-       char *preface;
-       char *postface;
+       char *prologue;
+       char *epilogue;
        
        /* < private > */
        gboolean write_end_boundary;
@@ -87,11 +87,11 @@ GMimeMultipart *g_mime_multipart_new (void);
 
 GMimeMultipart *g_mime_multipart_new_with_subtype (const char *subtype);
 
-void g_mime_multipart_set_preface (GMimeMultipart *multipart, const char *preface);
-const char *g_mime_multipart_get_preface (GMimeMultipart *multipart);
+void g_mime_multipart_set_prologue (GMimeMultipart *multipart, const char *prologue);
+const char *g_mime_multipart_get_prologue (GMimeMultipart *multipart);
 
-void g_mime_multipart_set_postface (GMimeMultipart *multipart, const char *postface);
-const char *g_mime_multipart_get_postface (GMimeMultipart *multipart);
+void g_mime_multipart_set_epilogue (GMimeMultipart *multipart, const char *epilogue);
+const char *g_mime_multipart_get_epilogue (GMimeMultipart *multipart);
 
 void g_mime_multipart_clear (GMimeMultipart *multipart);
 
diff --git a/gmime/gmime-parser.c b/gmime/gmime-parser.c
index f8dd3d2..0b96a5a 100644
--- a/gmime/gmime-parser.c
+++ b/gmime/gmime-parser.c
@@ -1762,7 +1762,7 @@ crlf2lf (char *in)
 }
 
 static BoundaryType
-parser_scan_multipart_face (GMimeParser *parser, GMimeMultipart *multipart, gboolean preface)
+parser_scan_multipart_face (GMimeParser *parser, GMimeMultipart *multipart, gboolean prologue)
 {
        GMimeStream *stream;
        BoundaryType found;
@@ -1782,10 +1782,10 @@ parser_scan_multipart_face (GMimeParser *parser, GMimeMultipart *multipart, gboo
                face = (char *) buffer->data;
                crlf2lf (face);
                
-               if (preface)
-                       g_mime_multipart_set_preface (multipart, face);
+               if (prologue)
+                       g_mime_multipart_set_prologue (multipart, face);
                else
-                       g_mime_multipart_set_postface (multipart, face);
+                       g_mime_multipart_set_epilogue (multipart, face);
        }
        
        g_object_unref (stream);
@@ -1793,8 +1793,8 @@ parser_scan_multipart_face (GMimeParser *parser, GMimeMultipart *multipart, gboo
        return found;
 }
 
-#define parser_scan_multipart_preface(parser, multipart) parser_scan_multipart_face (parser, multipart, TRUE)
-#define parser_scan_multipart_postface(parser, multipart) parser_scan_multipart_face (parser, multipart, 
FALSE)
+#define parser_scan_multipart_prologue(parser, multipart) parser_scan_multipart_face (parser, multipart, 
TRUE)
+#define parser_scan_multipart_epilogue(parser, multipart) parser_scan_multipart_face (parser, multipart, 
FALSE)
 
 static BoundaryType
 parser_scan_multipart_subparts (GMimeParser *parser, GMimeParserOptions *options, GMimeMultipart *multipart)
@@ -1876,7 +1876,7 @@ parser_construct_multipart (GMimeParser *parser, GMimeParserOptions *options, Co
        if ((boundary = g_mime_object_get_content_type_parameter (object, "boundary"))) {
                parser_push_boundary (parser, boundary);
                
-               *found = parser_scan_multipart_preface (parser, multipart);
+               *found = parser_scan_multipart_prologue (parser, multipart);
                
                if (*found == BOUNDARY_IMMEDIATE)
                        *found = parser_scan_multipart_subparts (parser, options, multipart);
@@ -1886,7 +1886,7 @@ parser_construct_multipart (GMimeParser *parser, GMimeParserOptions *options, Co
                        multipart->write_end_boundary = TRUE;
                        parser_skip_line (parser);
                        parser_pop_boundary (parser);
-                       *found = parser_scan_multipart_postface (parser, multipart);
+                       *found = parser_scan_multipart_epilogue (parser, multipart);
                        return object;
                }
                
@@ -1899,8 +1899,8 @@ parser_construct_multipart (GMimeParser *parser, GMimeParserOptions *options, Co
                        *found = BOUNDARY_IMMEDIATE;
        } else {
                w(g_warning ("multipart without boundary encountered"));
-               /* this will scan everything into the preface */
-               *found = parser_scan_multipart_preface (parser, multipart);
+               /* this will scan everything into the prologue */
+               *found = parser_scan_multipart_prologue (parser, multipart);
        }
        
        return object;