diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-08-07 07:33:03 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-08-07 07:33:03 -0500 |
| commit | e0aed61e96cf1ab0ad490e9b32bae8bea0430996 (patch) | |
| tree | 152e213a5c89ebce174069c74765bfc9e7a19c41 /res | |
| parent | 1fde9dc7a539e3366c7589b3714c845d461f41fb (diff) | |
| parent | 123c93a77c5411f0d8686d454640ae3e619fd658 (diff) | |
Merge "Support GMIME 3.0"
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_http_post.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/res/res_http_post.c b/res/res_http_post.c index 3f0a58e36..9f5b1837a 100644 --- a/res/res_http_post.c +++ b/res/res_http_post.c @@ -55,6 +55,9 @@ #ifdef GMIME_TYPE_CONTENT_TYPE #define AST_GMIME_VER_24 #endif +#if GMIME_MAJOR_VERSION >= 3 +#define AST_GMIME_VER_30 +#endif /* just a little structure to hold callback info for gmime */ struct mime_cbinfo { @@ -84,7 +87,11 @@ static void post_raw(GMimePart *part, const char *post_dir, const char *fn) stream = g_mime_stream_fs_new(fd); +#ifdef AST_GMIME_VER_30 + content = g_mime_part_get_content(part); +#else content = g_mime_part_get_content_object(part); +#endif g_mime_data_wrapper_write_to_stream(content, stream); g_mime_stream_flush(stream); @@ -107,7 +114,11 @@ static GMimeMessage *parse_message(FILE *f) g_object_unref(stream); - message = g_mime_parser_construct_message(parser); + message = g_mime_parser_construct_message(parser +#ifdef AST_GMIME_VER_30 + , NULL +#endif + ); g_object_unref(parser); @@ -486,7 +497,11 @@ static int reload(void) static int load_module(void) { - g_mime_init(0); + g_mime_init( +#ifndef AST_GMIME_VER_30 + 0 +#endif + ); __ast_http_post_load(0); |