GNOME.org
 

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

commit bca1d409a6d06c73b5ba1ad68c70faa777d8109f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 12 22:46:16 2011 -0500

    Remove CamelFolderSummaryClass.summary_header_save().
    
    No longer needed.

 camel/camel-folder-summary.c                |   49 ---------------------------
 camel/camel-folder-summary.h                |    3 --
 camel/providers/imap/camel-imap-summary.c   |   17 ---------
 camel/providers/imapx/camel-imapx-summary.c |   11 ------
 camel/providers/local/camel-local-summary.c |   15 --------
 camel/providers/local/camel-mbox-summary.c  |   17 ---------
 camel/providers/nntp/camel-nntp-summary.c   |   17 ---------
 7 files changed, 0 insertions(+), 129 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 623593a..a712263 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -129,8 +129,6 @@ static void cfs_schedule_info_release_timer (CamelFolderSummary *summary);
 static struct _node *my_list_append (struct _node **list, struct _node *n);
 static gint my_list_size (struct _node **list);
 
-static gint summary_header_save (CamelFolderSummary *, FILE *);
-
 static CamelMessageInfo * message_info_new_from_header (CamelFolderSummary *, struct _camel_header_raw *);
 static CamelMessageInfo * message_info_new_from_parser (CamelFolderSummary *, CamelMimeParser *);
 static CamelMessageInfo * message_info_new_from_message (CamelFolderSummary *summary, CamelMimeMessage *msg, const gchar *bodystructure);
@@ -799,51 +797,6 @@ content_info_to_db (CamelFolderSummary *summary,
 	return TRUE;
 }
 
-static gint
-summary_header_save (CamelFolderSummary *summary,
-                     FILE *out)
-{
-	gint unread = 0, deleted = 0, junk = 0, i;
-	GPtrArray *known_uids;
-
-	fseek (out, 0, SEEK_SET);
-
-	io(printf("Savining header\n"));
-
-	/* we always write out the current version */
-	camel_file_util_encode_fixed_int32 (out, CAMEL_FOLDER_SUMMARY_VERSION);
-	camel_file_util_encode_fixed_int32 (out, summary->flags);
-	camel_file_util_encode_fixed_int32 (out, summary->priv->nextuid);
-	camel_file_util_encode_time_t (out, summary->time);
-
-	known_uids = camel_folder_summary_get_array (summary);
-	for (i = 0; known_uids && i < known_uids->len; i++) {
-		CamelMessageInfo *info = camel_folder_summary_get (summary, g_ptr_array_index (known_uids, i));
-		guint32 flags;
-
-		if (info == NULL)
-			continue;
-
-		flags = camel_message_info_flags (info);
-		if ((flags & CAMEL_MESSAGE_SEEN) == 0)
-			unread++;
-		if ((flags & CAMEL_MESSAGE_DELETED) != 0)
-			deleted++;
-		if ((flags & CAMEL_MESSAGE_JUNK) != 0)
-			junk++;
-
-		camel_message_info_free (info);
-	}
-
-	camel_folder_summary_free_array (known_uids);
-
-	camel_file_util_encode_fixed_int32 (out, i); /* total count */
-	camel_file_util_encode_fixed_int32 (out, unread);
-	camel_file_util_encode_fixed_int32 (out, deleted);
-
-	return camel_file_util_encode_fixed_int32 (out, junk);
-}
-
 static gboolean
 folder_summary_replace_flags (CamelFolderSummary *summary,
                               CamelMessageInfo *info)
@@ -1140,8 +1093,6 @@ camel_folder_summary_class_init (CamelFolderSummaryClass *class)
 	class->message_info_size = sizeof (CamelMessageInfoBase);
 	class->content_info_size = sizeof (CamelMessageContentInfo);
 
-	class->summary_header_save = summary_header_save;
-
 	class->summary_header_from_db = summary_header_from_db;
 	class->summary_header_to_db = summary_header_to_db;
 	class->message_info_from_db = message_info_from_db;
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 8877126..ae93af2 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -257,9 +257,6 @@ struct _CamelFolderSummaryClass {
 	gsize message_info_size;
 	gsize content_info_size;
 
-	/* load/save the global info */
-	gint (*summary_header_save)(CamelFolderSummary *, FILE *);
-
 	/* Load/Save folder summary from DB*/
 	gboolean (*summary_header_from_db)(CamelFolderSummary *, struct _CamelFIRecord *);
 	struct _CamelFIRecord * (*summary_header_to_db)(CamelFolderSummary *, GError **error);
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index 6ea0de5..88dad20 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -36,8 +36,6 @@
 
 #define CAMEL_IMAP_SUMMARY_VERSION (3)
 
-static gint summary_header_save (CamelFolderSummary *, FILE *);
-
 static gboolean info_set_user_flag (CamelMessageInfo *info, const gchar *id, gboolean state);
 
 static gboolean summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir);
@@ -74,7 +72,6 @@ camel_imap_summary_class_init (CamelImapSummaryClass *class)
 	folder_summary_class->message_info_size = sizeof (CamelImapMessageInfo);
 	folder_summary_class->content_info_size = sizeof (CamelImapMessageContentInfo);
 	folder_summary_class->message_info_clone = imap_message_info_clone;
-	folder_summary_class->summary_header_save = summary_header_save;
 	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;
@@ -199,20 +196,6 @@ summary_header_to_db (CamelFolderSummary *s,
 	return fir;
 }
 
-static gint
-summary_header_save (CamelFolderSummary *s,
-                     FILE *out)
-{
-	CamelImapSummary *ims = CAMEL_IMAP_SUMMARY (s);
-
-	if (CAMEL_FOLDER_SUMMARY_CLASS (camel_imap_summary_parent_class)->summary_header_save (s, out) == -1)
-		return -1;
-
-	camel_file_util_encode_fixed_int32 (out, CAMEL_IMAP_SUMMARY_VERSION);
-
-	return camel_file_util_encode_fixed_int32 (out, ims->validity);
-}
-
 static CamelMessageInfo *
 message_info_from_db (CamelFolderSummary *s,
                       CamelMIRecord *mir)
diff --git a/camel/providers/imapx/camel-imapx-summary.c b/camel/providers/imapx/camel-imapx-summary.c
index c6e98d7..277752e 100644
--- a/camel/providers/imapx/camel-imapx-summary.c
+++ b/camel/providers/imapx/camel-imapx-summary.c
@@ -35,8 +35,6 @@
 
 #define CAMEL_IMAPX_SUMMARY_VERSION (4)
 
-static gint summary_header_save (CamelFolderSummary *, FILE *);
-
 static gboolean info_set_user_flag (CamelMessageInfo *info, const gchar *id, gboolean state);
 
 static gboolean summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir);
@@ -78,7 +76,6 @@ camel_imapx_summary_class_init (CamelIMAPXSummaryClass *class)
 	folder_summary_class->message_info_size = sizeof (CamelIMAPXMessageInfo);
 	folder_summary_class->content_info_size = sizeof (CamelIMAPXMessageContentInfo);
 	folder_summary_class->message_info_clone = imapx_message_info_clone;
-	folder_summary_class->summary_header_save = summary_header_save;
 	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;
@@ -218,14 +215,6 @@ summary_header_to_db (CamelFolderSummary *s,
 	return fir;
 }
 
-static gint
-summary_header_save (CamelFolderSummary *s,
-                     FILE *out)
-{
-	g_warning("imapx %s called; should never happen!\n", __func__);
-	return -1;
-}
-
 static CamelMessageInfo *
 message_info_from_db (CamelFolderSummary *s,
                       CamelMIRecord *mir)
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 2440ae0..9508bf0 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -46,8 +46,6 @@
 static CamelFIRecord * summary_header_to_db (CamelFolderSummary *, GError **error);
 static gboolean summary_header_from_db (CamelFolderSummary *, CamelFIRecord *);
 
-static gint summary_header_save (CamelFolderSummary *, FILE *);
-
 static CamelMessageInfo * message_info_new_from_header (CamelFolderSummary *, struct _camel_header_raw *);
 
 static gint local_summary_decode_x_evolution (CamelLocalSummary *cls, const gchar *xev, CamelLocalMessageInfo *mi);
@@ -103,7 +101,6 @@ camel_local_summary_class_init (CamelLocalSummaryClass *class)
 	folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (class);
 	folder_summary_class->message_info_size = sizeof (CamelLocalMessageInfo);
 	folder_summary_class->content_info_size = sizeof (CamelMessageContentInfo);
-	folder_summary_class->summary_header_save = summary_header_save;
 	folder_summary_class->summary_header_from_db = summary_header_from_db;
 	folder_summary_class->summary_header_to_db = summary_header_to_db;
 	folder_summary_class->message_info_new_from_header  = message_info_new_from_header;
@@ -697,18 +694,6 @@ summary_header_to_db (CamelFolderSummary *s,
 	return fir;
 }
 
-static gint
-summary_header_save (CamelFolderSummary *s,
-                     FILE *out)
-{
-	/*CamelLocalSummary *cls = (CamelLocalSummary *)s;*/
-
-	if (CAMEL_FOLDER_SUMMARY_CLASS (camel_local_summary_parent_class)->summary_header_save (s, out) == -1)
-		return -1;
-
-	return camel_file_util_encode_fixed_int32 (out, CAMEL_LOCAL_SUMMARY_VERSION);
-}
-
 static CamelMessageInfo *
 message_info_new_from_header (CamelFolderSummary *s,
                               struct _camel_header_raw *h)
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 7744bfd..15691e0 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -48,8 +48,6 @@ static gboolean summary_header_from_db (CamelFolderSummary *, CamelFIRecord *);
 static CamelMessageInfo * message_info_from_db (CamelFolderSummary *s, CamelMIRecord *record);
 static CamelMIRecord * message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info);
 
-static gint summary_header_save (CamelFolderSummary *, FILE *);
-
 static CamelMessageInfo * message_info_new_from_header (CamelFolderSummary *, struct _camel_header_raw *);
 static CamelMessageInfo * message_info_new_from_parser (CamelFolderSummary *, CamelMimeParser *);
 /*static void		  message_info_free (CamelFolderSummary *, CamelMessageInfo *);*/
@@ -131,7 +129,6 @@ camel_mbox_summary_class_init (CamelMboxSummaryClass *class)
 	folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (class);
 	folder_summary_class->message_info_size = sizeof (CamelMboxMessageInfo);
 	folder_summary_class->content_info_size = sizeof (CamelMboxMessageContentInfo);
-	folder_summary_class->summary_header_save = summary_header_save;
 	folder_summary_class->summary_header_from_db = summary_header_from_db;
 	folder_summary_class->summary_header_to_db = summary_header_to_db;
 	folder_summary_class->message_info_from_db = message_info_from_db;
@@ -263,20 +260,6 @@ summary_header_to_db (CamelFolderSummary *s,
 	return fir;
 }
 
-static gint
-summary_header_save (CamelFolderSummary *s,
-                     FILE *out)
-{
-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY (s);
-
-	if (CAMEL_FOLDER_SUMMARY_CLASS (camel_mbox_summary_parent_class)->summary_header_save (s, out) == -1)
-		return -1;
-
-	camel_file_util_encode_fixed_int32 (out, CAMEL_MBOX_SUMMARY_VERSION);
-
-	return camel_file_util_encode_gsize (out, mbs->folder_size);
-}
-
 static CamelMessageInfo *
 message_info_new_from_header (CamelFolderSummary *s,
                               struct _camel_header_raw *h)
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index c55d45f..e1c3f3d 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -54,7 +54,6 @@ struct _CamelNNTPSummaryPrivate {
 #define _PRIVATE(o) (((CamelNNTPSummary *)(o))->priv)
 
 static CamelMessageInfo * message_info_new_from_header (CamelFolderSummary *, struct _camel_header_raw *);
-static gint summary_header_save (CamelFolderSummary *, FILE *);
 static gboolean summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir);
 static CamelFIRecord * summary_header_to_db (CamelFolderSummary *s, GError **error);
 
@@ -71,7 +70,6 @@ camel_nntp_summary_class_init (CamelNNTPSummaryClass *class)
 	folder_summary_class->message_info_size = sizeof (CamelMessageInfoBase);
 	folder_summary_class->content_info_size = sizeof (CamelMessageContentInfo);
 	folder_summary_class->message_info_new_from_header = message_info_new_from_header;
-	folder_summary_class->summary_header_save = summary_header_save;
 	folder_summary_class->summary_header_from_db = summary_header_from_db;
 	folder_summary_class->summary_header_to_db = summary_header_to_db;
 }
@@ -159,21 +157,6 @@ summary_header_to_db (CamelFolderSummary *s,
 	return fir;
 }
 
-static gint
-summary_header_save (CamelFolderSummary *s,
-                     FILE *out)
-{
-	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY (s);
-
-	if (CAMEL_FOLDER_SUMMARY_CLASS (camel_nntp_summary_parent_class)->summary_header_save (s, out) == -1
-	    || camel_file_util_encode_fixed_int32 (out, CAMEL_NNTP_SUMMARY_VERSION) == -1
-	    || camel_file_util_encode_fixed_int32 (out, cns->high) == -1
-	    || camel_file_util_encode_fixed_int32 (out, cns->low) == -1)
-		return -1;
-
-	return 0;
-}
-
 /* ********************************************************************** */
 
 /* Note: This will be called from camel_nntp_command, so only use camel_nntp_raw_command */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]