[evolution-data-server] CamelIMAPXStoreSummary: Remove 'capabilities' member.



commit 8ce2f8ce7cb8b819c63a9f8e8129371aa3a03b24
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Aug 20 11:57:28 2013 -0400

    CamelIMAPXStoreSummary: Remove 'capabilities' member.
    
    Was this intended for caching server capabilities locally?  WTF.
    Thankfully we weren't actually using it for anything.

 camel/camel-imapx-store-summary.c |    8 +++-----
 camel/camel-imapx-store-summary.h |    1 -
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/camel/camel-imapx-store-summary.c b/camel/camel-imapx-store-summary.c
index 1cd9346..f702cd2 100644
--- a/camel/camel-imapx-store-summary.c
+++ b/camel/camel-imapx-store-summary.c
@@ -494,7 +494,7 @@ summary_header_load (CamelStoreSummary *s,
 {
        CamelIMAPXStoreSummary *is = (CamelIMAPXStoreSummary *) s;
        CamelStoreSummaryClass *store_summary_class;
-       gint32 version, capabilities;
+       gint32 version, unused;
 
        camel_imapx_namespace_list_clear (is->namespaces);
 
@@ -511,11 +511,9 @@ summary_header_load (CamelStoreSummary *s,
        }
 
        /* note file format can be expanded to contain more namespaces, but only 1 at the moment */
-       if (camel_file_util_decode_fixed_int32 (in, &capabilities) == -1)
+       if (camel_file_util_decode_fixed_int32 (in, &unused) == -1)
                return -1;
 
-       is->capabilities = capabilities;
-
        /* namespaces */
        if ((is->namespaces = namespace_load (s, in)) == NULL)
                return -1;
@@ -534,7 +532,7 @@ summary_header_save (CamelStoreSummary *s,
        store_summary_class = CAMEL_STORE_SUMMARY_CLASS (camel_imapx_store_summary_parent_class);
        if (store_summary_class->summary_header_save ((CamelStoreSummary *) s, out) == -1
            || camel_file_util_encode_fixed_int32 (out, CAMEL_IMAPX_STORE_SUMMARY_VERSION) == -1
-           || camel_file_util_encode_fixed_int32 (out, is->capabilities) == -1)
+           || camel_file_util_encode_fixed_int32 (out, 0) == -1)
                return -1;
 
        if (is->namespaces && namespace_save (s, out, is->namespaces) == -1)
diff --git a/camel/camel-imapx-store-summary.h b/camel/camel-imapx-store-summary.h
index 1bc663a..22272d6 100644
--- a/camel/camel-imapx-store-summary.h
+++ b/camel/camel-imapx-store-summary.h
@@ -83,7 +83,6 @@ struct _CamelIMAPXStoreSummary {
 
        /* header info */
        guint32 version;        /* version of base part of file */
-       guint32 capabilities;
        CamelIMAPXNamespaceList *namespaces; /* eventually to be a list */
 };
 


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