[evolution-mapi] Address some of the compiler and static analyzers warnings

[Milan Crha <mcrha src gnome org>]

commit f00080997dba04440a79f236957dc187c29d67c8
Author: Milan Crha <mcrha redhat com>
Date:   Thu May 17 15:14:44 2018 +0200

    Address some of the compiler and static analyzers warnings

 src/camel/camel-mapi-folder.c                |    8 ++++----
 src/libexchangemapi/e-mapi-cal-recur-utils.c |    1 +
 src/libexchangemapi/e-mapi-cal-recur-utils.h |    3 ++-
 src/libexchangemapi/e-mapi-cal-tz-utils.c    |    1 +
 src/libexchangemapi/e-mapi-cal-tz-utils.h    |    3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index e560ce8..ed50eaa 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -183,7 +183,7 @@ mapi_set_message_references (CamelMessageInfo *mi,
        refs = camel_header_references_decode (references);
        irt = camel_header_references_decode (in_reply_to);
        if (refs || irt) {
-               GArray *references;
+               GArray *references_arr;
 
                if (irt) {
                        /* The References field is populated from the "References" and/or "In-Reply-To"
@@ -193,7 +193,7 @@ mapi_set_message_references (CamelMessageInfo *mi,
                        refs = g_slist_concat (irt, refs);
                }
 
-               references = g_array_sized_new (FALSE, FALSE, sizeof (guint64), g_slist_length (refs));
+               references_arr = g_array_sized_new (FALSE, FALSE, sizeof (guint64), g_slist_length (refs));
 
                length = g_checksum_type_get_length (G_CHECKSUM_MD5);
                digest = g_alloca (length);
@@ -208,12 +208,12 @@ mapi_set_message_references (CamelMessageInfo *mi,
 
                        memcpy (tmp_msgid.id.hash, digest, sizeof (tmp_msgid.id.hash));
 
-                       g_array_append_val (references, tmp_msgid.id.id);
+                       g_array_append_val (references_arr, tmp_msgid.id.id);
                }
 
                g_slist_free_full (refs, g_free);
 
-               camel_message_info_take_references (mi, references);
+               camel_message_info_take_references (mi, references_arr);
        }
 }
 
diff --git a/src/libexchangemapi/e-mapi-cal-recur-utils.c b/src/libexchangemapi/e-mapi-cal-recur-utils.c
index 3274a30..d34e1bd 100644
--- a/src/libexchangemapi/e-mapi-cal-recur-utils.c
+++ b/src/libexchangemapi/e-mapi-cal-recur-utils.c
@@ -25,6 +25,7 @@
 
 #include <libecal/libecal.h>
 
+#include "e-mapi-cal-utils.h"
 #include "e-mapi-cal-recur-utils.h"
 
 /* Reader/Writer versions */
diff --git a/src/libexchangemapi/e-mapi-cal-recur-utils.h b/src/libexchangemapi/e-mapi-cal-recur-utils.h
index dd6cf1a..54f9058 100644
--- a/src/libexchangemapi/e-mapi-cal-recur-utils.h
+++ b/src/libexchangemapi/e-mapi-cal-recur-utils.h
@@ -25,8 +25,9 @@
 #define E_MAPI_CAL_RECUR_UTILS_H
 
 #include <glib.h>
+#include <libecal/libecal.h>
 
-#include "e-mapi-cal-utils.h"
+#include "e-mapi-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libexchangemapi/e-mapi-cal-tz-utils.c b/src/libexchangemapi/e-mapi-cal-tz-utils.c
index af0b1a4..32dba1d 100644
--- a/src/libexchangemapi/e-mapi-cal-tz-utils.c
+++ b/src/libexchangemapi/e-mapi-cal-tz-utils.c
@@ -23,6 +23,7 @@
 
 #include "evolution-mapi-config.h"
 
+#include "e-mapi-cal-utils.h"
 #include "e-mapi-cal-tz-utils.h"
 
 #define d(x) 
diff --git a/src/libexchangemapi/e-mapi-cal-tz-utils.h b/src/libexchangemapi/e-mapi-cal-tz-utils.h
index 06562eb..b4d792b 100644
--- a/src/libexchangemapi/e-mapi-cal-tz-utils.h
+++ b/src/libexchangemapi/e-mapi-cal-tz-utils.h
@@ -25,8 +25,9 @@
 #define E_MAPI_CAL_TZ_UTILS_H
 
 #include <glib.h>
+#include <libecal/libecal.h>
 
-#include "e-mapi-cal-utils.h"
+#include "e-mapi-connection.h"
 
 G_BEGIN_DECLS