[evolution-activesync] Fix camel build for Evolution 3.12

[dwmw2 <dwmw2 src gnome org>]

commit 5727b94a2ab625e2260bc314c8233f23d5a8696f
Author: David Woodhouse <David Woodhouse intel com>
Date:   Thu Mar 12 11:53:04 2015 +0000

    Fix camel build for Evolution 3.12
    
    Oops, this has been lying around for ages without being committed.

 camel/Makefile.am         |    2 --
 camel/camel-eas-folder.c  |   20 ++++++++++++--------
 camel/camel-eas-store.c   |    4 ++--
 camel/camel-eas-summary.c |    2 +-
 camel/camel-eas-utils.c   |    4 ++--
 configure.ac              |    6 +++---
 6 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/camel/Makefile.am b/camel/Makefile.am
index f66887a..785dc35 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -8,7 +8,6 @@ libcameleas_la_CPPFLAGS = \
        $(CAMEL_CFLAGS)                         \
        $(LIBEDATASERVER_CFLAGS)                \
        $(LIBECAL_CFLAGS)                       \
-       $(EVOLUTION_PLUGIN_CFLAGS)              \
        $(GNOME_INCLUDEDIR)                     \
        $(SOUP_CFLAGS)                          \
        $(LIBEBACKEND_CFLAGS)                   \
@@ -44,7 +43,6 @@ libcameleas_la_LIBADD =                                       \
        $(top_builddir)/libeasclient/libeasclient.la    \
        $(top_builddir)/libevoeas/libevoeas.la          \
        $(CAMEL_LIBS)                                   \
-       $(EVOLUTION_PLUGIN_LIBS)                        \
        $(LIBEDATASERVER_LIBS)                          \
        $(LIBEBACKEND_LIBS)                             \
        $(LIBECAL_LIBS)                                 \
diff --git a/camel/camel-eas-folder.c b/camel/camel-eas-folder.c
index 081d4cc..15c34f8 100644
--- a/camel/camel-eas-folder.c
+++ b/camel/camel-eas-folder.c
@@ -80,18 +80,22 @@ eas_get_filename (CamelFolder *folder, const gchar *uid, GError **error)
 static CamelMimeMessage *
 camel_eas_folder_get_message_from_cache (CamelEasFolder *eas_folder, const gchar *uid, GCancellable 
*cancellable, GError **error)
 {
-       CamelStream *stream;
+       CamelStream *stream = NULL;
+       GIOStream *base_stream;
        CamelMimeMessage *msg;
        CamelEasFolderPrivate *priv;
 
        priv = eas_folder->priv;
 
        g_rec_mutex_lock (&priv->cache_lock);
-       stream = camel_data_cache_get (eas_folder->cache, "cur", uid, error);
-       if (!stream) {
+       base_stream = camel_data_cache_get (eas_folder->cache, "cur", uid,
+                                           error);
+       if (!base_stream) {
                g_rec_mutex_unlock (&priv->cache_lock);
                return NULL;
        }
+       stream = camel_stream_new (base_stream);
+       g_object_unref (base_stream);
 
        msg = camel_mime_message_new ();
 
@@ -362,10 +366,10 @@ eas_delete_messages (CamelFolder *folder, GSList *deleted_uids, gboolean expunge
                GSList *l;
                for (l = deleted_uids; l != NULL; l = g_slist_next (l)) {
                        gchar *uid = l->data;
-                       camel_folder_summary_lock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
+                       camel_folder_summary_lock (folder->summary);
                        camel_folder_change_info_remove_uid (changes, uid);
                        camel_data_cache_remove (CAMEL_EAS_FOLDER (folder)->cache, "cache", uid, NULL);
-                       camel_folder_summary_unlock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
+                       camel_folder_summary_unlock (folder->summary);
                }
                camel_folder_changed (folder, changes);
                camel_folder_change_info_free (changes);
@@ -436,7 +440,7 @@ eas_synchronize_sync (CamelFolder *folder, gboolean expunge, GCancellable *cance
                        item_list_len++;
                } else if (flags_changed & CAMEL_MESSAGE_DELETED) {
                        deleted_uids = g_slist_prepend (deleted_uids, (gpointer) camel_pstring_strdup 
(uids->pdata [i]));
-                       camel_message_info_free (mi);
+                       camel_message_info_unref (mi);
                }
        }
 
@@ -452,7 +456,7 @@ eas_synchronize_sync (CamelFolder *folder, gboolean expunge, GCancellable *cance
                                mi->server_flags = mi->info.flags;
                                mi->info.dirty = TRUE;
                        }
-                       camel_message_info_free (mi);
+                       camel_message_info_unref (mi);
                }
                g_slist_free (changing_mis);
                changing_mis = NULL;
@@ -781,7 +785,7 @@ eas_expunge_sync (CamelFolder *folder, GCancellable *cancellable, GError **error
                if (eas_info && (eas_info->info.flags & CAMEL_MESSAGE_DELETED))
                        deleted_items = g_slist_prepend (deleted_items, (gpointer) camel_pstring_strdup 
(uid));
 
-               camel_message_info_free (info);
+               camel_message_info_unref (info);
        }
        camel_folder_summary_free_array (known_uids);
 
diff --git a/camel/camel-eas-store.c b/camel/camel-eas-store.c
index a6cb7f9..e3f50e3 100644
--- a/camel/camel-eas-store.c
+++ b/camel/camel-eas-store.c
@@ -90,7 +90,7 @@ eas_store_initable_init               (GInitable *initable,
                                 GError **error)
 {
        CamelService *service = CAMEL_SERVICE (initable);
-       CamelSession *session = camel_service_get_session (service);
+       CamelSession *session = camel_service_ref_session (service);
        gboolean ret;
 
        /* Chain up to parent interface's init() method. */
@@ -100,6 +100,7 @@ eas_store_initable_init             (GInitable *initable,
        ret = eas_store_construct (service, session, NULL,
                                   error);
 
+       g_object_unref(session);
        /* Add transport here ? */
 
        return ret;
@@ -523,7 +524,6 @@ camel_eas_store_class_init (CamelEasStoreClass *class)
        store_class->delete_folder_sync = eas_delete_folder_sync;
        store_class->rename_folder_sync = eas_rename_folder_sync;
        store_class->get_folder_info_sync = eas_get_folder_info_sync;
-       store_class->free_folder_info = camel_store_free_folder_info_full;
 
        store_class->get_trash_folder_sync = eas_get_trash_folder_sync;
        store_class->can_refresh_folder = eas_can_refresh_folder;
diff --git a/camel/camel-eas-summary.c b/camel/camel-eas-summary.c
index 4382104..125b443 100644
--- a/camel/camel-eas-summary.c
+++ b/camel/camel-eas-summary.c
@@ -286,7 +286,7 @@ camel_eas_summary_add_message       (CamelFolderSummary *summary,
        mi->info.uid = camel_pstring_strdup (uid);
 
        camel_folder_summary_add (summary, (CamelMessageInfo *)mi);
-       camel_message_info_free (info);
+       camel_message_info_unref (info);
 }
 
 void
diff --git a/camel/camel-eas-utils.c b/camel/camel-eas-utils.c
index b4a5ef7..e8d311f 100644
--- a/camel/camel-eas-utils.c
+++ b/camel/camel-eas-utils.c
@@ -367,7 +367,7 @@ camel_eas_utils_sync_updated_items (CamelEasFolder *eas_folder, GSList *items_up
 
                        mi->info.dirty = TRUE;
 
-                       camel_message_info_free (mi);
+                       camel_message_info_unref (mi);
                }
 
                g_object_unref (item);
@@ -410,7 +410,7 @@ camel_eas_utils_sync_created_items (CamelEasFolder *eas_folder, GSList *items_cr
 
                mi = (CamelEasMessageInfo *) camel_folder_summary_get (folder->summary, item->server_id);
                if (mi) {
-                       camel_message_info_free (mi);
+                       camel_message_info_unref (mi);
                        g_object_unref (item);
                        continue;
                }
diff --git a/configure.ac b/configure.ac
index ab5f2b4..f1b8897 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,9 +69,9 @@ CAMEL_PKG="camel-1.2"
 
 PKG_CHECK_MODULES(CAMEL, ${CAMEL_PKG})
 
-PKG_CHECK_MODULES(EVOLUTION_PLUGIN, evolution-plugin${EVO_PKG}, [have_e_plugin=yes], [have_eplugin=no])
-AC_SUBST(EVOLUTION_PLUGIN_CFLAGS)
-AC_SUBST(EVOLUTION_PLUGIN_LIBS)
+PKG_CHECK_MODULES(EVOLUTION_SHELL, evolution-plugin${EVO_PKG}, [have_e_plugin=yes], [have_eplugin=no])
+AC_SUBST(EVOLUTION_SHELL_CFLAGS)
+AC_SUBST(EVOLUTION_SHELL_LIBS)
 
 PKG_CHECK_MODULES(EVOLUTION_MAIL, evolution-mail${EVO_PKG}, [have_e_mail=yes], [have_e_mail=no])
 AC_SUBST(EVOLUTION_MAIL_CFLAGS)