index: explicitly follow GObject conventions

[notmuch] / gmime-filter-reply.c

diff --git a/gmime-filter-reply.c b/gmime-filter-reply.c
index b269db4e821265a065989a9b00c5f714c6b96c43..480d93817bb627e6afb2c1ef5cc8fe7093355945 100644 (file)
--- a/gmime-filter-reply.c
+++ b/gmime-filter-reply.c
@@ -16,7 +16,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
+#include <stdbool.h>
+
 #include "gmime-filter-reply.h"
+#include "notmuch-client.h"
 
 /**
  * SECTION: gmime-filter-reply
@@ -27,7 +30,7 @@
  **/
 
 
-static void g_mime_filter_reply_class_init (GMimeFilterReplyClass *klass);
+static void g_mime_filter_reply_class_init (GMimeFilterReplyClass *klass, void *class_data);
 static void g_mime_filter_reply_init (GMimeFilterReply *filter, GMimeFilterReplyClass *klass);
 static void g_mime_filter_reply_finalize (GObject *object);
 
@@ -48,16 +51,16 @@ g_mime_filter_reply_get_type (void)
 
        if (!type) {
                static const GTypeInfo info = {
-                       sizeof (GMimeFilterReplyClass),
-                       NULL, /* base_class_init */
-                       NULL, /* base_class_finalize */
-                       (GClassInitFunc) g_mime_filter_reply_class_init,
-                       NULL, /* class_finalize */
-                       NULL, /* class_data */
-                       sizeof (GMimeFilterReply),
-                       0,    /* n_preallocs */
-                       (GInstanceInitFunc) g_mime_filter_reply_init,
-                       NULL    /* value_table */
+                       .class_size = sizeof (GMimeFilterReplyClass),
+                       .base_init = NULL,
+                       .base_finalize = NULL,
+                       .class_init = (GClassInitFunc) g_mime_filter_reply_class_init,
+                       .class_finalize = NULL,
+                       .class_data = NULL,
+                       .instance_size = sizeof (GMimeFilterReply),
+                       .n_preallocs = 0,
+                       .instance_init = (GInstanceInitFunc) g_mime_filter_reply_init,
+                       .value_table = NULL,
                };
 
                type = g_type_register_static (GMIME_TYPE_FILTER, "GMimeFilterReply", &info, (GTypeFlags) 0);
@@ -68,7 +71,7 @@ g_mime_filter_reply_get_type (void)
 
 
 static void
-g_mime_filter_reply_class_init (GMimeFilterReplyClass *klass)
+g_mime_filter_reply_class_init (GMimeFilterReplyClass *klass, unused (void *class_data))
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
        GMimeFilterClass *filter_class = GMIME_FILTER_CLASS (klass);
@@ -87,8 +90,8 @@ static void
 g_mime_filter_reply_init (GMimeFilterReply *filter, GMimeFilterReplyClass *klass)
 {
        (void) klass;
-       filter->saw_nl = TRUE;
-       filter->saw_angle = FALSE;
+       filter->saw_nl = true;
+       filter->saw_angle = false;
 }
 
 static void
@@ -111,49 +114,49 @@ filter_filter (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace,
               char **outbuf, size_t *outlen, size_t *outprespace)
 {
        GMimeFilterReply *reply = (GMimeFilterReply *) filter;
-       register const char *inptr = inbuf;
+       const char *inptr = inbuf;
        const char *inend = inbuf + inlen;
        char *outptr;
 
        (void) prespace;
        if (reply->encode) {
-               g_mime_filter_set_size (filter, 3 * inlen, FALSE);
+               g_mime_filter_set_size (filter, 3 * inlen, false);
 
                outptr = filter->outbuf;
                while (inptr < inend) {
                        if (reply->saw_nl) {
                                *outptr++ = '>';
                                *outptr++ = ' ';
-                               reply->saw_nl = FALSE;
+                               reply->saw_nl = false;
                        }
                        if (*inptr == '\n')
-                               reply->saw_nl = TRUE;
+                               reply->saw_nl = true;
                        else
-                               reply->saw_nl = FALSE;
+                               reply->saw_nl = false;
                        if (*inptr != '\r')
                                *outptr++ = *inptr;
                        inptr++;
                }
        } else {
-               g_mime_filter_set_size (filter, inlen + 1, FALSE);
+               g_mime_filter_set_size (filter, inlen + 1, false);
 
                outptr = filter->outbuf;
                while (inptr < inend) {
                        if (reply->saw_nl) {
                                if (*inptr == '>')
-                                       reply->saw_angle = TRUE;
+                                       reply->saw_angle = true;
                                else
                                        *outptr++ = *inptr;
-                               reply->saw_nl = FALSE;
+                               reply->saw_nl = false;
                        } else if (reply->saw_angle) {
                                if (*inptr == ' ')
                                        ;
                                else
                                        *outptr++ = *inptr;
-                               reply->saw_angle = FALSE;
+                               reply->saw_angle = false;
                        } else if (*inptr != '\r') {
                                if (*inptr == '\n')
-                                       reply->saw_nl = TRUE;
+                                       reply->saw_nl = true;
                                *outptr++ = *inptr;
                        }
 
@@ -179,19 +182,19 @@ filter_reset (GMimeFilter *filter)
 {
        GMimeFilterReply *reply = (GMimeFilterReply *) filter;
 
-       reply->saw_nl = TRUE;
-       reply->saw_angle = FALSE;
+       reply->saw_nl = true;
+       reply->saw_angle = false;
 }
 
 
 /**
  * g_mime_filter_reply_new:
- * @encode: %TRUE if the filter should encode or %FALSE otherwise
+ * @encode: %true if the filter should encode or %false otherwise
  * @dots: encode/decode dots (as for SMTP)
  *
  * Creates a new #GMimeFilterReply filter.
  *
- * If @encode is %TRUE, then all lines will be prefixed by "> ",
+ * If @encode is %true, then all lines will be prefixed by "> ",
  * otherwise any lines starting with "> " will have that removed
  *
  * Returns: a new #GMimeFilterReply filter.
@@ -201,7 +204,7 @@ g_mime_filter_reply_new (gboolean encode)
 {
        GMimeFilterReply *new_reply;
 
-       new_reply = (GMimeFilterReply *) g_object_newv (GMIME_TYPE_FILTER_REPLY, 0, NULL);
+       new_reply = (GMimeFilterReply *) g_object_new (GMIME_TYPE_FILTER_REPLY, NULL);
        new_reply->encode = encode;
 
        return (GMimeFilter *) new_reply;