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



commit 633f7bab149e0a502c6a2d04ab93724b3855446f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 12 22:22:17 2011 -0500

    Remove camel_folder_summary_migrate_infos().
    
    No longer needed.

 camel/camel-folder-summary.c            |  143 -------------------------------
 camel/camel-folder-summary.h            |    4 -
 docs/reference/camel/camel-sections.txt |    1 -
 3 files changed, 0 insertions(+), 148 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index eaa9c3e..a8ef3b6 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1932,38 +1932,6 @@ perform_content_info_load_from_db (CamelFolderSummary *summary,
 	return ci;
 }
 
-/* loads the content descriptions, recursively */
-static CamelMessageContentInfo *
-perform_content_info_migrate (CamelFolderSummary *summary,
-                              FILE *in)
-{
-	gint i;
-	guint32 count;
-	CamelMessageContentInfo *ci, *part;
-
-	ci = CAMEL_FOLDER_SUMMARY_GET_CLASS (summary)->content_info_migrate (summary, in);
-	if (ci == NULL)
-		return NULL;
-
-	if (camel_file_util_decode_uint32 (in, &count) == -1) {
-		camel_folder_summary_content_info_free (summary, ci);
-		return NULL;
-	}
-
-	for (i = 0; i < count; i++) {
-		part = perform_content_info_migrate (summary, in);
-		if (part) {
-			my_list_append ((struct _node **) &ci->childs, (struct _node *) part);
-			part->parent = ci;
-		} else {
-			d(fprintf (stderr, "Summary file format messed up?"));
-			camel_folder_summary_content_info_free (summary, ci);
-			return NULL;
-		}
-	}
-	return ci;
-}
-
 static void
 append_changed_uids (gchar *key,
                      CamelMessageInfoBase *info,
@@ -2512,117 +2480,6 @@ camel_read_mir_callback (gpointer ref,
 	return ret;
 }
 
-/**
- * camel_folder_summary_migrate_infos:
- *
- * Since: 2.24
- **/
-gint
-camel_folder_summary_migrate_infos (CamelFolderSummary *summary)
-{
-	FILE *in;
-	gint i;
-	CamelMessageInfo *mi;
-	CamelMessageInfoBase *info;
-	CamelStore *parent_store;
-	gint ret = 0;
-	CamelDB *cdb;
-	CamelFIRecord *record;
-
-	parent_store = camel_folder_get_parent_store (summary->priv->folder);
-	cdb = parent_store->cdb_w;
-
-	/* Kick off the gc thread cycle. */
-	if (summary->priv->timeout_handle)
-		g_source_remove (summary->priv->timeout_handle);
-	summary->priv->timeout_handle = 0;
-
-	d(g_print ("\ncamel_folder_summary_load from FLAT FILE called \n"));
-
-	if (summary->priv->summary_path == NULL) {
-		g_warning ("No summary path set. Unable to migrate\n");
-		return -1;
-	}
-
-	in = g_fopen (summary->priv->summary_path, "rb");
-	if (in == NULL)
-		return -1;
-
-	if (CAMEL_FOLDER_SUMMARY_GET_CLASS (summary)->summary_header_load (summary, in) == -1)
-		goto error;
-
-	/* now read in each message ... */
-	for (i = 0; i < summary->priv->saved_count; i++) {
-		CamelTag *tag;
-
-		mi = CAMEL_FOLDER_SUMMARY_GET_CLASS (summary)->message_info_migrate (summary, in);
-
-		if (mi == NULL)
-			goto error;
-
-		/* FIXME: this should be done differently, how i don't know */
-		if (summary->priv->build_content) {
-			((CamelMessageInfoBase *) mi)->content = perform_content_info_migrate (summary, in);
-			if (((CamelMessageInfoBase *) mi)->content == NULL) {
-				camel_message_info_free (mi);
-				goto error;
-			}
-		}
-
-		info = (CamelMessageInfoBase *) mi;
-		tag = info->user_tags;
-		while (tag) {
-			if (strcmp (tag->name, "label")) {
-				camel_flag_set (&info->user_flags, tag->value, TRUE);
-			}
-			tag = tag->next;
-		}
-
-		mi->dirty = TRUE;
-		g_hash_table_insert (summary->priv->loaded_infos, (gpointer) mi->uid, mi);
-	}
-
-	if (fclose (in) != 0)
-		return -1;
-
-	record = CAMEL_FOLDER_SUMMARY_GET_CLASS (summary)->summary_header_to_db (summary, NULL);
-	if (!record) {
-		return -1;
-	}
-
-	ret = save_message_infos_to_db (summary, TRUE, NULL);
-
-	if (ret != 0) {
-		g_free (record->folder_name);
-		g_free (record->bdata);
-		g_free (record);
-		return -1;
-	}
-
-	camel_db_begin_transaction (cdb, NULL);
-	ret = camel_db_write_folder_info_record (cdb, record, NULL);
-	camel_db_end_transaction (cdb, NULL);
-
-	g_free (record->folder_name);
-	g_free (record->bdata);
-	g_free (record);
-
-	if (ret != 0) {
-		return -1;
-	}
-
-	return ret;
-
-error:
-	if (errno != EINVAL)
-		g_warning ("Cannot load summary file: '%s': %s", summary->priv->summary_path, g_strerror (errno));
-
-	fclose (in);
-
-	return -1;
-
-}
-
 /* saves the content descriptions, recursively */
 static gboolean
 perform_content_info_save_to_db (CamelFolderSummary *summary,
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 944a256..b6eb2c9 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -383,10 +383,6 @@ void			camel_folder_summary_add_preview
 							(CamelFolderSummary *summary,
 							 CamelMessageInfo *info);
 
-/* Migration code */
-gint			camel_folder_summary_migrate_infos
-							(CamelFolderSummary *summary);
-
 /* build/add raw summary items */
 CamelMessageInfo *	camel_folder_summary_add_from_header
 							(CamelFolderSummary *summary,
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 2c0c340..dfe3df4 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -607,7 +607,6 @@ camel_folder_summary_info_new_from_message
 camel_folder_summary_content_info_new
 camel_folder_summary_content_info_free
 camel_folder_summary_add_preview
-camel_folder_summary_migrate_infos
 camel_folder_summary_add_from_header
 camel_folder_summary_add_from_parser
 camel_folder_summary_add_from_message



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]