GNOME.org
 

[evolution-data-server] Remove camel_folder_summary_set_filename().

commit fc4a3e9087a0352a3c671dd74e479961c55627ac
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 12 23:01:33 2011 -0500

    Remove camel_folder_summary_set_filename().
    
    No longer needed.

 camel/camel-folder-summary.c                  |   22 ----------------------
 camel/camel-folder-summary.h                  |    5 -----
 camel/providers/imap/camel-imap-folder.c      |   13 +++----------
 camel/providers/imap/camel-imap-store.c       |    2 +-
 camel/providers/imap/camel-imap-summary.c     |    5 +----
 camel/providers/imap/camel-imap-summary.h     |    3 +--
 camel/providers/imapx/camel-imapx-folder.c    |    7 ++-----
 camel/providers/imapx/camel-imapx-store.c     |    2 +-
 camel/providers/imapx/camel-imapx-summary.c   |    4 +---
 camel/providers/imapx/camel-imapx-summary.h   |    3 +--
 camel/providers/local/camel-local-folder.c    |    7 +------
 camel/providers/local/camel-local-folder.h    |    2 --
 camel/providers/local/camel-local-summary.c   |    2 --
 camel/providers/local/camel-local-summary.h   |    2 +-
 camel/providers/local/camel-maildir-folder.c  |    3 +--
 camel/providers/local/camel-maildir-store.c   |   12 ++++--------
 camel/providers/local/camel-maildir-summary.c |    5 ++---
 camel/providers/local/camel-maildir-summary.h |    2 +-
 camel/providers/local/camel-mbox-folder.c     |    3 +--
 camel/providers/local/camel-mbox-store.c      |    7 ++-----
 camel/providers/local/camel-mbox-summary.c    |    3 +--
 camel/providers/local/camel-mbox-summary.h    |    1 -
 camel/providers/local/camel-mh-folder.c       |    3 +--
 camel/providers/local/camel-mh-store.c        |    9 +--------
 camel/providers/local/camel-mh-summary.c      |    3 +--
 camel/providers/local/camel-mh-summary.h      |    2 +-
 camel/providers/local/camel-spool-folder.c    |    1 -
 camel/providers/local/camel-spool-summary.c   |    2 +-
 camel/providers/nntp/camel-nntp-folder.c      |    4 +---
 camel/providers/nntp/camel-nntp-summary.c     |    4 +---
 camel/providers/nntp/camel-nntp-summary.h     |    3 +--
 docs/reference/camel/camel-sections.txt       |    1 -
 32 files changed, 33 insertions(+), 114 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index a712263..5b8c9e6 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -93,7 +93,6 @@ struct _CamelFolderSummaryPrivate {
 	guint32 junk_not_deleted_count;
 	guint32 visible_count;
 
-	gchar *summary_path;
 	gboolean build_content;	/* do we try and parse/index the content, or not? */
 
 	GHashTable *uids; /* uids of all known message infos; the 'value' are used flags for the message info */
@@ -241,8 +240,6 @@ folder_summary_finalize (GObject *object)
 
 	g_hash_table_destroy (priv->preview_updates);
 
-	g_free (priv->summary_path);
-
 	g_static_rec_mutex_free (&priv->summary_lock);
 	g_static_rec_mutex_free (&priv->io_lock);
 	g_static_rec_mutex_free (&priv->filter_lock);
@@ -1618,25 +1615,6 @@ camel_folder_summary_next_uid_string (CamelFolderSummary *summary)
 }
 
 /**
- * camel_folder_summary_set_filename:
- * @summary: a #CamelFolderSummary object
- * @filename: a filename
- *
- * Set the filename where the summary will be loaded to/saved from.
- **/
-void
-camel_folder_summary_set_filename (CamelFolderSummary *summary,
-                                   const gchar *name)
-{
-	camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
-
-	g_free (summary->priv->summary_path);
-	summary->priv->summary_path = g_strdup (name);
-
-	camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
-}
-
-/**
  * camel_folder_summary_count:
  * @summary: a #CamelFolderSummary object
  *
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index ae93af2..ae4e8da 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -560,11 +560,6 @@ const CamelMessageContentInfo *
 							(CamelMessageInfo *mi,
 							 CamelContentType *ctype);
 
-/* Deprecated */
-void			camel_folder_summary_set_filename
-							(CamelFolderSummary *summary,
-							 const gchar *filename);
-
 /* debugging functions */
 void			camel_content_info_dump		(CamelMessageContentInfo *ci,
 							 gint depth);
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 751e6cd..4ca38ba 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -376,7 +376,7 @@ camel_imap_folder_new (CamelStore *parent,
 	CamelFolder *folder;
 	CamelImapFolder *imap_folder;
 	const gchar *short_name;
-	gchar *summary_file, *state_file, *path;
+	gchar *state_file, *path;
 
 	if (g_mkdir_with_parents (folder_dir, S_IRWXU) != 0) {
 		g_set_error (
@@ -398,9 +398,7 @@ camel_imap_folder_new (CamelStore *parent,
 		"display-name", short_name,
 		"parent-store", parent, NULL);
 
-	summary_file = g_build_filename (folder_dir, "summary", NULL);
-	folder->summary = camel_imap_summary_new (folder, summary_file);
-	g_free (summary_file);
+	folder->summary = camel_imap_summary_new (folder);
 	if (!folder->summary) {
 		g_object_unref (folder);
 		g_set_error (
@@ -715,7 +713,7 @@ imap_rename (CamelFolder *folder,
 	CamelStore *parent_store;
 	CamelImapFolder *imap_folder = (CamelImapFolder *) folder;
 	const gchar *user_cache_dir;
-	gchar *folder_dir, *summary_path, *state_file;
+	gchar *folder_dir, *state_file;
 	gchar *folders;
 
 	parent_store = camel_folder_get_parent_store (folder);
@@ -727,19 +725,14 @@ imap_rename (CamelFolder *folder,
 	folder_dir = imap_path_to_physical (folders, new);
 	g_free (folders);
 
-	summary_path = g_build_filename (folder_dir, "summary", NULL);
-
 	CAMEL_IMAP_FOLDER_REC_LOCK (folder, cache_lock);
 	camel_imap_message_cache_set_path (imap_folder->cache, folder_dir);
 	CAMEL_IMAP_FOLDER_REC_UNLOCK (folder, cache_lock);
 
-	camel_folder_summary_set_filename (folder->summary, summary_path);
-
 	state_file = g_build_filename (folder_dir, "cmeta", NULL);
 	camel_object_set_state_filename (CAMEL_OBJECT (folder), state_file);
 	g_free (state_file);
 
-	g_free (summary_path);
 	g_free (folder_dir);
 
 	CAMEL_FOLDER_CLASS (camel_imap_folder_parent_class)->rename (folder, new);
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 13c561a..2c66bb8 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -2890,7 +2890,7 @@ fill_fi (CamelStore *store,
 		if (folder->summary)
 			ims = (CamelImapSummary *) folder->summary;
 		else
-			ims = (CamelImapSummary *) camel_imap_summary_new (folder, NULL);
+			ims = (CamelImapSummary *) camel_imap_summary_new (folder);
 
 		fi->unread = camel_folder_summary_get_unread_count ((CamelFolderSummary *) ims);
 		fi->total = camel_folder_summary_get_saved_count ((CamelFolderSummary *) ims);
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index 88dad20..937c9bc 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -117,7 +117,6 @@ sort_uid_cmp (gpointer enc,
 /**
  * camel_imap_summary_new:
  * @folder: Parent folder.
- * @filename: the file to store the summary in.
  *
  * This will create a new CamelImapSummary object and read in the
  * summary data from disk, if it exists.
@@ -125,8 +124,7 @@ sort_uid_cmp (gpointer enc,
  * Returns: A new CamelImapSummary object.
  **/
 CamelFolderSummary *
-camel_imap_summary_new (CamelFolder *folder,
-                        const gchar *filename)
+camel_imap_summary_new (CamelFolder *folder)
 {
 	CamelStore *parent_store;
 	CamelFolderSummary *summary;
@@ -145,7 +143,6 @@ camel_imap_summary_new (CamelFolder *folder,
 	}
 
 	camel_folder_summary_set_build_content (summary, TRUE);
-	camel_folder_summary_set_filename (summary, filename);
 
 	if (!camel_folder_summary_load_from_db (summary, NULL)) {
 		/* FIXME: Isn't this dangerous ? We clear the summary
diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h
index 5ca93fb..f71d83f 100644
--- a/camel/providers/imap/camel-imap-summary.h
+++ b/camel/providers/imap/camel-imap-summary.h
@@ -86,8 +86,7 @@ struct _CamelImapSummaryClass {
 
 GType		camel_imap_summary_get_type	(void);
 CamelFolderSummary *
-		camel_imap_summary_new		(CamelFolder *folder,
-						 const gchar *filename);
+		camel_imap_summary_new		(CamelFolder *folder);
 void		camel_imap_summary_add_offline	(CamelFolderSummary *summary,
 						 const gchar *uid,
 						 CamelMimeMessage *message,
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index bffcb00..6197a57 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -51,7 +51,7 @@ camel_imapx_folder_new (CamelStore *store,
 	CamelSettings *settings;
 	CamelIMAPXFolder *ifolder;
 	const gchar *short_name;
-	gchar *summary_file, *state_file;
+	gchar *state_file;
 	gboolean filter_inbox;
 	gboolean filter_junk;
 	gboolean filter_junk_inbox;
@@ -83,8 +83,7 @@ camel_imapx_folder_new (CamelStore *store,
 
 	((CamelIMAPXFolder *) folder)->raw_name = g_strdup (folder_name);
 
-	summary_file = g_build_filename (folder_dir, "summary", NULL);
-	folder->summary = camel_imapx_summary_new (folder, summary_file);
+	folder->summary = camel_imapx_summary_new (folder);
 	if (!folder->summary) {
 		g_set_error (
 			error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
@@ -123,8 +122,6 @@ camel_imapx_folder_new (CamelStore *store,
 	} else if (filter_junk && !filter_junk_inbox)
 			folder->folder_flags |= CAMEL_FOLDER_FILTER_JUNK;
 
-	g_free (summary_file);
-
 	camel_store_summary_connect_folder_summary (
 		(CamelStoreSummary *) ((CamelIMAPXStore *) store)->summary,
 		folder_name, folder->summary);
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 7e1b626..c8cb019 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -394,7 +394,7 @@ fill_fi (CamelStore *store,
 		if (folder->summary)
 			ims = (CamelIMAPXSummary *) folder->summary;
 		else
-			ims = (CamelIMAPXSummary *) camel_imapx_summary_new (folder, NULL);
+			ims = (CamelIMAPXSummary *) camel_imapx_summary_new (folder);
 
 		fi->unread = camel_folder_summary_get_unread_count ((CamelFolderSummary *) ims);
 		fi->total = camel_folder_summary_get_saved_count ((CamelFolderSummary *) ims);
diff --git a/camel/providers/imapx/camel-imapx-summary.c b/camel/providers/imapx/camel-imapx-summary.c
index 277752e..f913f78 100644
--- a/camel/providers/imapx/camel-imapx-summary.c
+++ b/camel/providers/imapx/camel-imapx-summary.c
@@ -129,8 +129,7 @@ sort_uid_cmp (gpointer enc,
  * Returns: A new CamelIMAPXSummary object.
  **/
 CamelFolderSummary *
-camel_imapx_summary_new (CamelFolder *folder,
-                         const gchar *filename)
+camel_imapx_summary_new (CamelFolder *folder)
 {
 	CamelStore *parent_store;
 	CamelFolderSummary *summary;
@@ -148,7 +147,6 @@ camel_imapx_summary_new (CamelFolder *folder,
 	}
 
 	camel_folder_summary_set_build_content (summary, TRUE);
-	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/camel/providers/imapx/camel-imapx-summary.h b/camel/providers/imapx/camel-imapx-summary.h
index dc145ba..311341b 100644
--- a/camel/providers/imapx/camel-imapx-summary.h
+++ b/camel/providers/imapx/camel-imapx-summary.h
@@ -84,8 +84,7 @@ struct _CamelIMAPXSummaryClass {
 
 GType		camel_imapx_summary_get_type	(void);
 CamelFolderSummary *
-		camel_imapx_summary_new		(CamelFolder *folder,
-						 const gchar *filename);
+		camel_imapx_summary_new		(CamelFolder *folder);
 void		camel_imapx_summary_add_offline	(CamelFolderSummary *summary,
 						 const gchar *uid,
 						 CamelMimeMessage *message,
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index b6601bb..6de9b8e 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -137,7 +137,6 @@ local_folder_finalize (GObject *object)
 
 	g_free (local_folder->base_path);
 	g_free (local_folder->folder_path);
-	g_free (local_folder->summary_path);
 	g_free (local_folder->index_path);
 
 	camel_folder_change_info_free (local_folder->changes);
@@ -313,18 +312,15 @@ local_folder_rename (CamelFolder *folder,
 	/* Sync? */
 
 	g_free (lf->folder_path);
-	g_free (lf->summary_path);
 	g_free (lf->index_path);
 
 	lf->folder_path = camel_local_store_get_full_path (ls, newname);
-	lf->summary_path = camel_local_store_get_meta_path(ls, newname, ".ev-summary");
 	lf->index_path = camel_local_store_get_meta_path(ls, newname, ".ibex");
 	statepath = camel_local_store_get_meta_path(ls, newname, ".cmeta");
 	camel_object_set_state_filename (CAMEL_OBJECT (lf), statepath);
 	g_free (statepath);
 
 	/* FIXME: Poke some internals, sigh */
-	camel_folder_summary_set_filename (folder->summary, lf->summary_path);
 	g_free (((CamelLocalSummary *) folder->summary)->folder_path);
 	((CamelLocalSummary *) folder->summary)->folder_path = g_strdup (lf->folder_path);
 
@@ -550,7 +546,6 @@ camel_local_folder_construct (CamelLocalFolder *lf,
 	lf->base_path = g_strdup (path);
 
 	lf->folder_path = camel_local_store_get_full_path (ls, full_name);
-	lf->summary_path = camel_local_store_get_meta_path(ls, full_name, ".ev-summary");
 	lf->index_path = camel_local_store_get_meta_path(ls, full_name, ".ibex");
 	statepath = camel_local_store_get_meta_path(ls, full_name, ".cmeta");
 
@@ -618,7 +613,7 @@ camel_local_folder_construct (CamelLocalFolder *lf,
 		forceindex = FALSE;
 	}
 
-	folder->summary = (CamelFolderSummary *) CAMEL_LOCAL_FOLDER_GET_CLASS (lf)->create_summary (lf, lf->summary_path, lf->folder_path, lf->index);
+	folder->summary = (CamelFolderSummary *) CAMEL_LOCAL_FOLDER_GET_CLASS (lf)->create_summary (lf, lf->folder_path, lf->index);
 	if (!(flags & CAMEL_STORE_IS_MIGRATING) && !camel_local_summary_load ((CamelLocalSummary *) folder->summary, forceindex, NULL)) {
 		/* ? */
 		if (need_summary_check &&
diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
index 02415dd..af08004 100644
--- a/camel/providers/local/camel-local-folder.h
+++ b/camel/providers/local/camel-local-folder.h
@@ -62,7 +62,6 @@ struct _CamelLocalFolder {
 
 	gchar *base_path;	/* base path of the local folder */
 	gchar *folder_path;	/* the path to the folder itself */
-	gchar *summary_path;	/* where the summary lives */
 	gchar *index_path;	/* where the index file lives */
 
 	CamelIndex *index;	   /* index for this folder */
@@ -78,7 +77,6 @@ struct _CamelLocalFolderClass {
 	/* summary factory, only used at init */
 	CamelLocalSummary *
 			(*create_summary)	(CamelLocalFolder *lf,
-						 const gchar *path,
 						 const gchar *folder,
 						 CamelIndex *index);
 
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 9508bf0..1566037 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -127,12 +127,10 @@ camel_local_summary_init (CamelLocalSummary *local_summary)
 
 void
 camel_local_summary_construct (CamelLocalSummary *new,
-                               const gchar *filename,
                                const gchar *local_name,
                                CamelIndex *index)
 {
 	camel_folder_summary_set_build_content (CAMEL_FOLDER_SUMMARY (new), FALSE);
-	camel_folder_summary_set_filename (CAMEL_FOLDER_SUMMARY (new), filename);
 	new->folder_path = g_strdup (local_name);
 	new->index = index;
 	if (index)
diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h
index 9de024d..193ac7a 100644
--- a/camel/providers/local/camel-local-summary.h
+++ b/camel/providers/local/camel-local-summary.h
@@ -86,7 +86,7 @@ struct _CamelLocalSummaryClass {
 };
 
 GType	camel_local_summary_get_type	(void);
-void	camel_local_summary_construct	(CamelLocalSummary *new, const gchar *filename, const gchar *local_name, CamelIndex *index);
+void	camel_local_summary_construct	(CamelLocalSummary *new, const gchar *local_name, CamelIndex *index);
 
 /* load/check the summary */
 gboolean camel_local_summary_load (CamelLocalSummary *cls, gint forceindex, GError **error);
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index 0ffcc54..a8adf29 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -422,12 +422,11 @@ maildir_folder_transfer_messages_to_sync (CamelFolder *source,
 
 static CamelLocalSummary *
 maildir_folder_create_summary (CamelLocalFolder *lf,
-                               const gchar *path,
                                const gchar *folder,
                                CamelIndex *index)
 {
 	return (CamelLocalSummary *) camel_maildir_summary_new (
-		CAMEL_FOLDER (lf), path, folder, index);
+		CAMEL_FOLDER (lf), folder, index);
 }
 
 static void
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index 47540b8..920cfdc 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -397,7 +397,7 @@ fill_fi (CamelStore *store,
 		CamelLocalSettings *local_settings;
 		CamelSettings *settings;
 		CamelService *service;
-		gchar *path, *folderpath, *dir_name;
+		gchar *folderpath, *dir_name;
 		CamelFolderSummary *s;
 		const gchar *root;
 
@@ -410,22 +410,18 @@ fill_fi (CamelStore *store,
 		/* This should be fast enough not to have to test for INFO_FAST */
 		dir_name = maildir_full_name_to_dir_name (fi->full_name);
 
-		if (!strcmp (dir_name, ".")) {
-			path = g_build_filename (root, ".ev-summary", NULL);
+		if (!strcmp (dir_name, "."))
 			folderpath = g_strdup (root);
-		} else {
-			path = g_build_filename (root, dir_name, ".ev-summary", NULL);
+		else
 			folderpath = g_build_filename (root, dir_name, NULL);
-		}
 
-		s = (CamelFolderSummary *) camel_maildir_summary_new (NULL, path, folderpath, NULL);
+		s = (CamelFolderSummary *) camel_maildir_summary_new (NULL, folderpath, NULL);
 		if (camel_folder_summary_header_load_from_db (s, store, fi->full_name, NULL)) {
 			fi->unread = camel_folder_summary_get_unread_count (s);
 			fi->total = camel_folder_summary_get_saved_count (s);
 		}
 		g_object_unref (s);
 		g_free (folderpath);
-		g_free (path);
 		g_free (dir_name);
 	}
 
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 723db89..bc4faab 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -136,7 +136,6 @@ camel_maildir_summary_init (CamelMaildirSummary *maildir_summary)
 /**
  * camel_maildir_summary_new:
  * @folder: parent folder.
- * @filename: Path to root of this maildir directory (containing new/tmp/cur directories).
  * @index: Index if one is reqiured.
  *
  * Create a new CamelMaildirSummary object.
@@ -144,7 +143,7 @@ camel_maildir_summary_init (CamelMaildirSummary *maildir_summary)
  * Returns: A new #CamelMaildirSummary object.
  **/
 CamelMaildirSummary
-*camel_maildir_summary_new(struct _CamelFolder *folder, const gchar *filename, const gchar *maildirdir, CamelIndex *index)
+*camel_maildir_summary_new(struct _CamelFolder *folder, const gchar *maildirdir, CamelIndex *index)
 {
 	CamelMaildirSummary *o;
 
@@ -157,7 +156,7 @@ CamelMaildirSummary
 		((CamelFolderSummary *)o)->sort_by = "dreceived";
 		((CamelFolderSummary *) o)->collate = NULL;
 	}
-	camel_local_summary_construct ((CamelLocalSummary *) o, filename, maildirdir, index);
+	camel_local_summary_construct ((CamelLocalSummary *) o, maildirdir, index);
 	return o;
 }
 
diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h
index f680339..6ec0f77 100644
--- a/camel/providers/local/camel-maildir-summary.h
+++ b/camel/providers/local/camel-maildir-summary.h
@@ -73,7 +73,7 @@ struct _CamelMaildirSummaryClass {
 };
 
 GType	 camel_maildir_summary_get_type	(void);
-CamelMaildirSummary	*camel_maildir_summary_new	(struct _CamelFolder *folder, const gchar *filename, const gchar *maildirdir, CamelIndex *index);
+CamelMaildirSummary	*camel_maildir_summary_new	(struct _CamelFolder *folder, const gchar *maildirdir, CamelIndex *index);
 
 /* convert some info->flags to/from the messageinfo */
 gchar *camel_maildir_summary_info_to_name (const CamelMaildirMessageInfo *info);
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index c52d30a..85424bf 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -414,11 +414,10 @@ fail:
 
 static CamelLocalSummary *
 mbox_folder_create_summary (CamelLocalFolder *lf,
-                            const gchar *path,
                             const gchar *folder,
                             CamelIndex *index)
 {
-	return (CamelLocalSummary *) camel_mbox_summary_new ((CamelFolder *) lf, path, folder, index);
+	return (CamelLocalSummary *) camel_mbox_summary_new ((CamelFolder *) lf, folder, index);
 }
 
 static gint
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index e8621f1..7d5c2d3 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -117,18 +117,16 @@ fill_fi (CamelStore *store,
 		g_object_unref (folder);
 	} else {
 		CamelLocalStore *local_store;
-		gchar *path, *folderpath;
+		gchar *folderpath;
 		CamelMboxSummary *mbs;
 
 		local_store = CAMEL_LOCAL_STORE (store);
 
 		/* This should be fast enough not to have to test for INFO_FAST */
-		path = camel_local_store_get_meta_path (
-			local_store, fi->full_name, ".ev-summary");
 		folderpath = camel_local_store_get_full_path (
 			local_store, fi->full_name);
 
-		mbs = (CamelMboxSummary *) camel_mbox_summary_new (NULL, path, folderpath, NULL);
+		mbs = (CamelMboxSummary *) camel_mbox_summary_new (NULL, folderpath, NULL);
 		/* FIXME[disk-summary] track exception */
 		if (camel_folder_summary_header_load_from_db ((CamelFolderSummary *) mbs, store, fi->full_name, NULL)) {
 			fi->unread = camel_folder_summary_get_unread_count ((CamelFolderSummary *) mbs);
@@ -137,7 +135,6 @@ fill_fi (CamelStore *store,
 
 		g_object_unref (mbs);
 		g_free (folderpath);
-		g_free (path);
 	}
 
 	if (camel_local_store_is_main_store (CAMEL_LOCAL_STORE (store)) && fi->full_name
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 15691e0..1ba2790 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -173,7 +173,6 @@ camel_mbox_summary_init (CamelMboxSummary *mbox_summary)
  **/
 CamelMboxSummary *
 camel_mbox_summary_new (CamelFolder *folder,
-                        const gchar *filename,
                         const gchar *mbox_name,
                         CamelIndex *index)
 {
@@ -192,7 +191,7 @@ camel_mbox_summary_new (CamelFolder *folder,
 		summary->collate = "mbox_frompos_sort";
 
 	}
-	camel_local_summary_construct ((CamelLocalSummary *) new, filename, mbox_name, index);
+	camel_local_summary_construct ((CamelLocalSummary *) new, mbox_name, index);
 	return new;
 }
 
diff --git a/camel/providers/local/camel-mbox-summary.h b/camel/providers/local/camel-mbox-summary.h
index b6409fd..c425b0b 100644
--- a/camel/providers/local/camel-mbox-summary.h
+++ b/camel/providers/local/camel-mbox-summary.h
@@ -92,7 +92,6 @@ struct _CamelMboxSummaryClass {
 GType		camel_mbox_summary_get_type	(void);
 CamelMboxSummary *
 		camel_mbox_summary_new		(CamelFolder *folder,
-						 const gchar *filename,
 						 const gchar *mbox_name,
 						 CamelIndex *index);
 
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index a006100..53be12a 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -202,12 +202,11 @@ mh_folder_get_message_sync (CamelFolder *folder,
 
 static CamelLocalSummary *
 mh_folder_create_summary (CamelLocalFolder *lf,
-                          const gchar *path,
                           const gchar *folder,
                           CamelIndex *index)
 {
 	return (CamelLocalSummary *) camel_mh_summary_new (
-		CAMEL_FOLDER (lf), path, folder, index);
+		CAMEL_FOLDER (lf), folder, index);
 }
 
 static void
diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index c5f2cf5..a6d773d 100644
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.c
@@ -204,11 +204,9 @@ fill_fi (CamelStore *store,
 		CamelLocalSettings *local_settings;
 		CamelSettings *settings;
 		CamelService *service;
-		gchar *filename;
 		gchar *folderpath;
 		CamelFolderSummary *s;
 		const gchar *path;
-		gchar *basename;
 
 		service = CAMEL_SERVICE (store);
 		settings = camel_service_get_settings (service);
@@ -222,13 +220,9 @@ fill_fi (CamelStore *store,
 		 * scan of all messages for their status flags.  But its probably not worth
 		 * it as we need to read the top of every file, i.e. very very slow */
 
-		basename = g_strdup_printf ("%s.ev-summary", fi->full_name);
-		filename = g_build_filename (path, basename, NULL);
-		g_free (basename);
-
 		folderpath = g_strdup_printf ("%s/%s", path, fi->full_name);
 		s = (CamelFolderSummary *) camel_mh_summary_new (
-			NULL, filename, folderpath, NULL);
+			NULL, folderpath, NULL);
 		if (camel_folder_summary_header_load_from_db (
 			s, store, fi->full_name, NULL)) {
 			fi->unread = camel_folder_summary_get_unread_count (s);
@@ -236,7 +230,6 @@ fill_fi (CamelStore *store,
 		}
 		g_object_unref (s);
 		g_free (folderpath);
-		g_free (filename);
 	}
 
 	if (camel_local_store_is_main_store (local_store) && fi->full_name
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index 2d9de03..2fa2c41 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -92,7 +92,6 @@ camel_mh_summary_init (CamelMhSummary *mh_summary)
  **/
 CamelMhSummary *
 camel_mh_summary_new (CamelFolder *folder,
-                      const gchar *filename,
                       const gchar *mhdir,
                       CamelIndex *index)
 {
@@ -108,7 +107,7 @@ camel_mh_summary_new (CamelFolder *folder,
 		((CamelFolderSummary *)o)->collate = "mh_uid_sort";
 	}
 
-	camel_local_summary_construct ((CamelLocalSummary *) o, filename, mhdir, index);
+	camel_local_summary_construct ((CamelLocalSummary *) o, mhdir, index);
 	return o;
 }
 
diff --git a/camel/providers/local/camel-mh-summary.h b/camel/providers/local/camel-mh-summary.h
index 6566f18..392cba2 100644
--- a/camel/providers/local/camel-mh-summary.h
+++ b/camel/providers/local/camel-mh-summary.h
@@ -58,7 +58,7 @@ struct _CamelMhSummaryClass {
 };
 
 GType	 camel_mh_summary_get_type	(void);
-CamelMhSummary	*camel_mh_summary_new (struct _CamelFolder *, const gchar *filename, const gchar *mhdir, CamelIndex *index);
+CamelMhSummary	*camel_mh_summary_new (struct _CamelFolder *, const gchar *mhdir, CamelIndex *index);
 
 G_END_DECLS
 
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index b24c65b..1c085e4 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -45,7 +45,6 @@ G_DEFINE_TYPE (CamelSpoolFolder, camel_spool_folder, CAMEL_TYPE_MBOX_FOLDER)
 
 static CamelLocalSummary *
 spool_folder_create_summary (CamelLocalFolder *lf,
-                             const gchar *path,
                              const gchar *folder,
                              CamelIndex *index)
 {
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index 222a48d..33831d4 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -95,7 +95,7 @@ camel_spool_summary_new (CamelFolder *folder,
 		((CamelFolderSummary *)new)->sort_by = "bdata";
 		((CamelFolderSummary *)new)->collate = "spool_frompos_sort";
 	}
-	camel_local_summary_construct ((CamelLocalSummary *) new, NULL, mbox_name, NULL);
+	camel_local_summary_construct ((CamelLocalSummary *) new, mbox_name, NULL);
 	camel_folder_summary_load_from_db ((CamelFolderSummary *) new, NULL);
 	return new;
 }
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 2881df4..7681b0a 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -728,9 +728,7 @@ camel_nntp_folder_new (CamelStore *parent,
 	camel_object_state_read (CAMEL_OBJECT (nntp_folder));
 	g_free (root);
 
-	root = g_strdup_printf("%s.ev-summary", nntp_folder->storage_path);
-	folder->summary = (CamelFolderSummary *) camel_nntp_summary_new (folder, root);
-	g_free (root);
+	folder->summary = (CamelFolderSummary *) camel_nntp_summary_new (folder);
 
 	camel_folder_summary_load_from_db (folder->summary, NULL);
 
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index e1c3f3d..4d0754b 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -88,14 +88,12 @@ camel_nntp_summary_init (CamelNNTPSummary *nntp_summary)
 }
 
 CamelNNTPSummary *
-camel_nntp_summary_new (CamelFolder *folder,
-                        const gchar *path)
+camel_nntp_summary_new (CamelFolder *folder)
 {
 	CamelNNTPSummary *cns;
 
 	cns = g_object_new (CAMEL_TYPE_NNTP_SUMMARY, "folder", folder, NULL);
 
-	camel_folder_summary_set_filename ((CamelFolderSummary *) cns, path);
 	camel_folder_summary_set_build_content ((CamelFolderSummary *) cns, FALSE);
 
 	return cns;
diff --git a/camel/providers/nntp/camel-nntp-summary.h b/camel/providers/nntp/camel-nntp-summary.h
index 98236e0..4d633a9 100644
--- a/camel/providers/nntp/camel-nntp-summary.h
+++ b/camel/providers/nntp/camel-nntp-summary.h
@@ -65,8 +65,7 @@ struct _CamelNNTPSummaryClass {
 
 GType		camel_nntp_summary_get_type	(void);
 CamelNNTPSummary *
-		camel_nntp_summary_new		(CamelFolder *folder,
-						 const gchar *path);
+		camel_nntp_summary_new		(CamelFolder *folder);
 gint		camel_nntp_summary_check	(CamelNNTPSummary *cns,
 						 struct _CamelNNTPStore *store,
 						 gchar *line,
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index dfe3df4..aa0c15d 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -670,7 +670,6 @@ camel_message_info_set_flags
 camel_message_info_set_user_flag
 camel_message_info_set_user_tag
 camel_folder_summary_guess_content_info
-camel_folder_summary_set_filename
 camel_content_info_dump
 camel_message_info_dump
 bdata_extract_digit
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]