[evolution-mapi] Adapt to CamelFolderSummary changes.

[Matthew Barnes <mbarnes src gnome org>]

commit 027ee36d9fa46b63ccb8050cd097427518efbcdd
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Nov 13 00:42:56 2011 -0500

    Adapt to CamelFolderSummary changes.

 src/camel/camel-mapi-folder-summary.c |    4 +---
 src/camel/camel-mapi-folder-summary.h |    2 +-
 src/camel/camel-mapi-folder.c         |    7 ++-----
 3 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder-summary.c b/src/camel/camel-mapi-folder-summary.c
index ae49547..d99bd35 100644
--- a/src/camel/camel-mapi-folder-summary.c
+++ b/src/camel/camel-mapi-folder-summary.c
@@ -107,7 +107,6 @@ camel_mapi_folder_summary_init (CamelMapiFolderSummary *mapi_summary)
 
 /**
  * camel_mapi_folder_summary_new:
- * @filename: the file to store the summary in.
  *
  * This will create a new CamelMapiFolderSummary object and read in the
  * summary data from disk, if it exists.
@@ -115,7 +114,7 @@ camel_mapi_folder_summary_init (CamelMapiFolderSummary *mapi_summary)
  * Return value: A new CamelMapiFolderSummary object.
  **/
 CamelFolderSummary *
-camel_mapi_folder_summary_new (CamelFolder *folder, const gchar *filename)
+camel_mapi_folder_summary_new (CamelFolder *folder)
 {
 	CamelFolderSummary *summary;
 	GError *local_error = NULL;
@@ -123,7 +122,6 @@ camel_mapi_folder_summary_new (CamelFolder *folder, const gchar *filename)
 	summary = g_object_new (CAMEL_TYPE_MAPI_FOLDER_SUMMARY, "folder", folder, NULL);
 
 	camel_folder_summary_set_build_content (summary, FALSE);
-	camel_folder_summary_set_filename (summary, filename);
 
 	if (!camel_folder_summary_load_from_db (summary, &local_error)) {
 		/* FIXME: Isn't this dangerous ? We clear the summary
diff --git a/src/camel/camel-mapi-folder-summary.h b/src/camel/camel-mapi-folder-summary.h
index e6e023f..0e2f8ac 100644
--- a/src/camel/camel-mapi-folder-summary.h
+++ b/src/camel/camel-mapi-folder-summary.h
@@ -77,7 +77,7 @@ struct _CamelMapiFolderSummaryClass {
 
 GType camel_mapi_folder_summary_get_type (void);
 
-CamelFolderSummary *camel_mapi_folder_summary_new (struct _CamelFolder *folder, const gchar *filename);
+CamelFolderSummary *camel_mapi_folder_summary_new (struct _CamelFolder *folder);
 
 void mapi_summary_clear (CamelFolderSummary *summary, gboolean uncache);
 void camel_mapi_folder_summary_update_store_info_counts (CamelMapiFolderSummary *mapi_summary);
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index 46fd125..2d45a56 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -1998,7 +1998,7 @@ camel_mapi_folder_new (CamelStore *store, const gchar *folder_name, const gchar
 	CamelService    *service;
 	CamelSettings   *settings;
 
-	gchar *summary_file, *state_file;
+	gchar *state_file;
 	const gchar *short_name;
 	CamelStoreInfo *si;
 	gboolean filter_inbox;
@@ -2021,10 +2021,7 @@ camel_mapi_folder_new (CamelStore *store, const gchar *folder_name, const gchar
 
 	mapi_folder = CAMEL_MAPI_FOLDER(folder);
 
-	summary_file = g_strdup_printf ("%s/%s/summary",folder_dir, folder_name);
-
-	folder->summary = camel_mapi_folder_summary_new (folder, summary_file);
-	g_free(summary_file);
+	folder->summary = camel_mapi_folder_summary_new (folder);
 
 	if (!folder->summary) {
 		g_object_unref (CAMEL_OBJECT (folder));