[evolution-data-server] Remove CamelFolderSummaryClass.content_info_migrate().

[Matthew Barnes <mbarnes src gnome org>]

commit 43952694cc9e371753b7ffc2545dce3369be2b34
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 12 22:31:09 2011 -0500

    Remove CamelFolderSummaryClass.content_info_migrate().
    
    No longer needed.

 camel/camel-folder-summary.c                |   54 ---------------------------
 camel/camel-folder-summary.h                |    1 -
 camel/providers/imap/camel-imap-summary.c   |   12 ------
 camel/providers/imapx/camel-imapx-summary.c |   17 --------
 4 files changed, 0 insertions(+), 84 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 4bfe98c..8afa7e9 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -140,7 +140,6 @@ static void		  message_info_free (CamelFolderSummary *, CamelMessageInfo *);
 static CamelMessageContentInfo * content_info_new_from_header (CamelFolderSummary *, struct _camel_header_raw *);
 static CamelMessageContentInfo * content_info_new_from_parser (CamelFolderSummary *, CamelMimeParser *);
 static CamelMessageContentInfo * content_info_new_from_message (CamelFolderSummary *summary, CamelMimePart *mp);
-static CamelMessageContentInfo * content_info_migrate (CamelFolderSummary *, FILE *);
 static void			 content_info_free (CamelFolderSummary *, CamelMessageContentInfo *);
 
 static gint save_message_infos_to_db (CamelFolderSummary *summary, gboolean fresh_mir, GError **error);
@@ -1162,7 +1161,6 @@ camel_folder_summary_class_init (CamelFolderSummaryClass *class)
 	class->content_info_new_from_header  = content_info_new_from_header;
 	class->content_info_new_from_parser = content_info_new_from_parser;
 	class->content_info_new_from_message = content_info_new_from_message;
-	class->content_info_migrate = content_info_migrate;
 	class->content_info_free = content_info_free;
 
 	class->next_uid_string = next_uid_string;
@@ -3840,58 +3838,6 @@ content_info_new_from_header (CamelFolderSummary *summary,
 	return ci;
 }
 
-static CamelMessageContentInfo *
-content_info_migrate (CamelFolderSummary *summary,
-                      FILE *in)
-{
-	CamelMessageContentInfo *ci;
-	gchar *type, *subtype;
-	guint32 count, i;
-	CamelContentType *ct;
-
-	io(printf("Loading content info\n"));
-
-	ci = camel_folder_summary_content_info_new (summary);
-
-	camel_folder_summary_decode_token (in, &type);
-	camel_folder_summary_decode_token (in, &subtype);
-	ct = camel_content_type_new (type, subtype);
-	g_free (type);		/* can this be removed? */
-	g_free (subtype);
-
-	if (camel_file_util_decode_uint32 (in, &count) == -1)
-		goto error;
-
-	for (i = 0; i < count; i++) {
-		gchar *name, *value;
-		camel_folder_summary_decode_token (in, &name);
-		camel_folder_summary_decode_token (in, &value);
-		if (!(name && value))
-			goto error;
-
-		camel_content_type_set_param (ct, name, value);
-		/* TODO: do this so we dont have to double alloc/free */
-		g_free (name);
-		g_free (value);
-	}
-	ci->type = ct;
-
-	camel_folder_summary_decode_token (in, &ci->id);
-	camel_folder_summary_decode_token (in, &ci->description);
-	camel_folder_summary_decode_token (in, &ci->encoding);
-
-	camel_file_util_decode_uint32 (in, &ci->size);
-
-	ci->childs = NULL;
-
-	if (!ferror (in))
-		return ci;
-
- error:
-	camel_folder_summary_content_info_free (summary, ci);
-	return NULL;
-}
-
 static void
 content_info_free (CamelFolderSummary *summary,
                    CamelMessageContentInfo *ci)
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 5f39b0a..88fdfb1 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -280,7 +280,6 @@ struct _CamelFolderSummaryClass {
 	CamelMessageContentInfo * (*content_info_new_from_header)(CamelFolderSummary *, struct _camel_header_raw *);
 	CamelMessageContentInfo * (*content_info_new_from_parser)(CamelFolderSummary *, CamelMimeParser *);
 	CamelMessageContentInfo * (*content_info_new_from_message)(CamelFolderSummary *, CamelMimePart *);
-	CamelMessageContentInfo * (*content_info_migrate)(CamelFolderSummary *, FILE *);
 	void			  (*content_info_free)(CamelFolderSummary *, CamelMessageContentInfo *);
 	CamelMessageInfo * (*message_info_from_uid) (CamelFolderSummary *, const gchar *);
 	/* get the next uid */
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index b96771f..d0a54c4 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -40,7 +40,6 @@ static gint summary_header_load (CamelFolderSummary *, FILE *);
 static gint summary_header_save (CamelFolderSummary *, FILE *);
 
 static gboolean info_set_user_flag (CamelMessageInfo *info, const gchar *id, gboolean state);
-static CamelMessageContentInfo *content_info_migrate (CamelFolderSummary *s, FILE *in);
 
 static gboolean summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir);
 static CamelFIRecord * summary_header_to_db (CamelFolderSummary *s, GError **error);
@@ -78,7 +77,6 @@ camel_imap_summary_class_init (CamelImapSummaryClass *class)
 	folder_summary_class->message_info_clone = imap_message_info_clone;
 	folder_summary_class->summary_header_load = summary_header_load;
 	folder_summary_class->summary_header_save = summary_header_save;
-	folder_summary_class->content_info_migrate = content_info_migrate;
 	folder_summary_class->summary_header_to_db = summary_header_to_db;
 	folder_summary_class->summary_header_from_db = summary_header_from_db;
 	folder_summary_class->message_info_to_db = message_info_to_db;
@@ -323,16 +321,6 @@ content_info_from_db (CamelFolderSummary *s,
 		return camel_folder_summary_content_info_new (s);
 }
 
-static CamelMessageContentInfo *
-content_info_migrate (CamelFolderSummary *s,
-                      FILE *in)
-{
-	if (fgetc (in))
-		return CAMEL_FOLDER_SUMMARY_CLASS (camel_imap_summary_parent_class)->content_info_migrate (s, in);
-	else
-		return camel_folder_summary_content_info_new (s);
-}
-
 static gboolean
 content_info_to_db (CamelFolderSummary *s,
                     CamelMessageContentInfo *info,
diff --git a/camel/providers/imapx/camel-imapx-summary.c b/camel/providers/imapx/camel-imapx-summary.c
index 973aafd..de09449 100644
--- a/camel/providers/imapx/camel-imapx-summary.c
+++ b/camel/providers/imapx/camel-imapx-summary.c
@@ -39,7 +39,6 @@ static gint summary_header_load (CamelFolderSummary *, FILE *);
 static gint summary_header_save (CamelFolderSummary *, FILE *);
 
 static gboolean info_set_user_flag (CamelMessageInfo *info, const gchar *id, gboolean state);
-static CamelMessageContentInfo *content_info_migrate (CamelFolderSummary *s, FILE *in);
 
 static gboolean summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir);
 static CamelFIRecord * summary_header_to_db (CamelFolderSummary *s, GError **error);
@@ -82,7 +81,6 @@ camel_imapx_summary_class_init (CamelIMAPXSummaryClass *class)
 	folder_summary_class->message_info_clone = imapx_message_info_clone;
 	folder_summary_class->summary_header_load = summary_header_load;
 	folder_summary_class->summary_header_save = summary_header_save;
-	folder_summary_class->content_info_migrate = content_info_migrate;
 	folder_summary_class->summary_header_to_db = summary_header_to_db;
 	folder_summary_class->summary_header_from_db = summary_header_from_db;
 	folder_summary_class->message_info_to_db = message_info_to_db;
@@ -365,21 +363,6 @@ content_info_from_db (CamelFolderSummary *s,
 		return camel_folder_summary_content_info_new (s);
 }
 
-static CamelMessageContentInfo *
-content_info_migrate (CamelFolderSummary *s,
-                      FILE *in)
-{
-	CamelFolderSummaryClass *folder_summary_class;
-
-	folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
-		camel_imapx_summary_parent_class);
-
-	if (fgetc (in))
-		return folder_summary_class->content_info_migrate (s, in);
-	else
-		return camel_folder_summary_content_info_new (s);
-}
-
 static gboolean
 content_info_to_db (CamelFolderSummary *s,
                     CamelMessageContentInfo *info,