Blob Blame History Raw
Adjust for newer gmime (2.4.3)

Lubomir Rintel <lkundrak@v3.sk>

diff -up balsa-2.3.28/libbalsa/body.c.gmime balsa-2.3.28/libbalsa/body.c
--- balsa-2.3.28/libbalsa/body.c.gmime	2009-03-19 20:14:29.370533523 +0100
+++ balsa-2.3.28/libbalsa/body.c	2009-03-19 20:32:28.567533343 +0100
@@ -437,7 +437,7 @@ libbalsa_message_body_get_stream(LibBals
 
     if (body->message->mailbox) {
         GMimeDataWrapper *wrapper;
-        GMimePartEncodingType encoding;
+        GMimeContentEncoding encoding;
         if(!libbalsa_mailbox_get_message_part(body->message, body, err))
             return NULL;
 	
@@ -474,21 +474,21 @@ libbalsa_message_body_get_stream(LibBals
         encoding = g_mime_data_wrapper_get_encoding(wrapper);
 
         switch (encoding) {
-        case GMIME_PART_ENCODING_BASE64:
+        case GMIME_CONTENT_ENCODING_BASE64:
             filter =
-                g_mime_filter_basic_new_type(GMIME_CONTENT_ENCODING_BASE64,
+                g_mime_filter_basic_new(GMIME_CONTENT_ENCODING_BASE64,
 					     FALSE);
             stream =
                 libbalsa_message_body_stream_add_filter(stream, filter);
             break;
-        case GMIME_PART_ENCODING_QUOTEDPRINTABLE:
+        case GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE:
             filter =
                 g_mime_filter_basic_new(GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE,
 					FALSE);
             stream =
                 libbalsa_message_body_stream_add_filter(stream, filter);
             break;
-        case GMIME_PART_ENCODING_UUENCODE:
+        case GMIME_CONTENT_ENCODING_UUENCODE:
             filter =
                 g_mime_filter_basic_new(GMIME_CONTENT_ENCODING_UUENCODE, FALSE);
             stream =
@@ -643,7 +643,7 @@ libbalsa_message_body_save_stream(LibBal
 
             if (!GMIME_IS_STREAM_FILTER(stream)) {
                 GMimeStream *stream_filter =
-                    g_mime_stream_filter_new_with_stream(stream);
+                    g_mime_stream_filter_new(stream);
                 g_object_unref(stream);
                 stream = stream_filter;
             }
diff -up balsa-2.3.28/libbalsa/send.c.gmime balsa-2.3.28/libbalsa/send.c
--- balsa-2.3.28/libbalsa/send.c.gmime	2009-03-19 20:17:57.933534878 +0100
+++ balsa-2.3.28/libbalsa/send.c	2009-03-19 20:27:17.364534221 +0100
@@ -1771,13 +1771,13 @@ libbalsa_message_create_mime_message(Lib
 		mime_part =
 		    GMIME_OBJECT(g_mime_part_new_with_type(mime_type[0],
 				                           mime_type[1]));
-		g_mime_part_set_content_disposition(GMIME_PART(mime_part),
+		g_mime_object_set_disposition(mime_part,
 			body->attach_mode == LIBBALSA_ATTACH_AS_INLINE ?
 			GMIME_DISPOSITION_INLINE : GMIME_DISPOSITION_ATTACHMENT);
 		if(strcasecmp(mime_type[0],"text") != 0)
 		{
-		    g_mime_part_set_encoding(GMIME_PART(mime_part),
-			    GMIME_PART_ENCODING_BASE64);
+		    g_mime_part_set_content_encoding(GMIME_PART(mime_part),
+			    GMIME_CONTENT_ENCODING_BASE64);
 		} else {
 		    /* is text */
 		    g_mime_object_set_content_type_parameter(mime_part,