CamelIMAPXStoreSummary: Remove 'capabilities' member.
authorMatthew Barnes <mbarnes@redhat.com>
Tue, 20 Aug 2013 15:57:28 +0000 (11:57 -0400)
committerMatthew Barnes <mbarnes@redhat.com>
Tue, 20 Aug 2013 16:01:53 +0000 (12:01 -0400)
Was this intended for caching server capabilities locally?  WTF.
Thankfully we weren't actually using it for anything.

camel/camel-imapx-store-summary.c
camel/camel-imapx-store-summary.h

index 1cd9346..f702cd2 100644 (file)
@@ -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)
index 1bc663a..22272d6 100644 (file)
@@ -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 */
 };