[evolution-data-server] camel-store-summary.h readability cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit 83ac4f9c38c40a810d24c1a8507e6d4343450f2e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Aug 16 08:18:59 2013 -0400

    camel-store-summary.h readability cleanups.

 camel/camel-store-summary.h |  145 ++++++++++++++++++++++++++++++-------------
 1 files changed, 101 insertions(+), 44 deletions(-)
---
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index b33a9d6..2ecc744 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -54,6 +54,8 @@
 
 G_BEGIN_DECLS
 
+struct _CamelFolderSummary;
+
 typedef struct _CamelStoreSummary CamelStoreSummary;
 typedef struct _CamelStoreSummaryClass CamelStoreSummaryClass;
 typedef struct _CamelStoreSummaryPrivate CamelStoreSummaryPrivate;
@@ -117,76 +119,131 @@ struct _CamelStoreSummaryClass {
        CamelObjectClass parent_class;
 
        /* load/save the global info */
-       gint (*summary_header_load)(CamelStoreSummary *, FILE *);
-       gint (*summary_header_save)(CamelStoreSummary *, FILE *);
+       gint            (*summary_header_load)  (CamelStoreSummary *summary,
+                                                FILE *file);
+       gint            (*summary_header_save)  (CamelStoreSummary *summary,
+                                                FILE *file);
 
        /* create/save/load an individual message info */
-       CamelStoreInfo * (*store_info_new)(CamelStoreSummary *, const gchar *path);
-       CamelStoreInfo * (*store_info_load)(CamelStoreSummary *, FILE *);
-       gint              (*store_info_save)(CamelStoreSummary *, FILE *, CamelStoreInfo *);
-       void              (*store_info_free)(CamelStoreSummary *, CamelStoreInfo *);
+       CamelStoreInfo *
+                       (*store_info_new)       (CamelStoreSummary *summary,
+                                                const gchar *path);
+       CamelStoreInfo *
+                       (*store_info_load)      (CamelStoreSummary *summary,
+                                                FILE *file);
+       gint            (*store_info_save)      (CamelStoreSummary *summary,
+                                                FILE *file,
+                                                CamelStoreInfo *info);
+       void            (*store_info_free)      (CamelStoreSummary *summary,
+                                                CamelStoreInfo *info);
 
        /* virtualise access methods */
-       const gchar *(*store_info_string)(CamelStoreSummary *, const CamelStoreInfo *, gint);
-       void (*store_info_set_string)(CamelStoreSummary *, CamelStoreInfo *, int, const gchar *);
+       const gchar *   (*store_info_string)    (CamelStoreSummary *summary,
+                                                const CamelStoreInfo *info,
+                                                gint type);
+       void            (*store_info_set_string)
+                                               (CamelStoreSummary *summary,
+                                                CamelStoreInfo *info,
+                                                gint type,
+                                                const gchar *value);
 };
 
-GType                   camel_store_summary_get_type   (void);
-CamelStoreSummary      *camel_store_summary_new        (void);
-
-void camel_store_summary_set_filename (CamelStoreSummary *summary, const gchar *filename);
+GType          camel_store_summary_get_type    (void) G_GNUC_CONST;
+CamelStoreSummary *
+               camel_store_summary_new         (void);
+void           camel_store_summary_set_filename
+                                               (CamelStoreSummary *summary,
+                                                const gchar *filename);
 
 /* load/save the summary in its entirety */
-gint camel_store_summary_load (CamelStoreSummary *summary);
-gint camel_store_summary_save (CamelStoreSummary *summary);
+gint           camel_store_summary_load        (CamelStoreSummary *summary);
+gint           camel_store_summary_save        (CamelStoreSummary *summary);
 
 /* only load the header */
-gint camel_store_summary_header_load (CamelStoreSummary *summary);
+gint           camel_store_summary_header_load (CamelStoreSummary *summary);
 
 /* set the dirty bit on the summary */
-void camel_store_summary_touch (CamelStoreSummary *summary);
+void           camel_store_summary_touch       (CamelStoreSummary *summary);
 
 /* add a new raw summary item */
-void camel_store_summary_add (CamelStoreSummary *summary, CamelStoreInfo *info);
+void           camel_store_summary_add         (CamelStoreSummary *summary,
+                                                CamelStoreInfo *info);
 
 /* build/add raw summary items */
-CamelStoreInfo *camel_store_summary_add_from_path (CamelStoreSummary *summary, const gchar *path);
+CamelStoreInfo *
+               camel_store_summary_add_from_path
+                                               (CamelStoreSummary *summary,
+                                                const gchar *path);
 
 /* Just build raw summary items */
-CamelStoreInfo *camel_store_summary_info_new (CamelStoreSummary *summary);
-CamelStoreInfo *camel_store_summary_info_new_from_path (CamelStoreSummary *summary, const gchar *path);
-
-void camel_store_summary_info_ref (CamelStoreSummary *summary, CamelStoreInfo *info);
-void camel_store_summary_info_free (CamelStoreSummary *summary, CamelStoreInfo *info);
+CamelStoreInfo *
+               camel_store_summary_info_new    (CamelStoreSummary *summary);
+CamelStoreInfo *
+               camel_store_summary_info_new_from_path
+                                               (CamelStoreSummary *summary,
+                                                const gchar *path);
+
+void           camel_store_summary_info_ref    (CamelStoreSummary *summary,
+                                                CamelStoreInfo *info);
+void           camel_store_summary_info_free   (CamelStoreSummary *summary,
+                                                CamelStoreInfo *info);
 
 /* removes a summary item */
-void camel_store_summary_remove (CamelStoreSummary *summary, CamelStoreInfo *info);
-void camel_store_summary_remove_path (CamelStoreSummary *summary, const gchar *path);
-void camel_store_summary_remove_index (CamelStoreSummary *summary, gint index);
+void           camel_store_summary_remove      (CamelStoreSummary *summary,
+                                                CamelStoreInfo *info);
+void           camel_store_summary_remove_path (CamelStoreSummary *summary,
+                                                const gchar *path);
+void           camel_store_summary_remove_index
+                                               (CamelStoreSummary *summary,
+                                                gint index);
 
 /* remove all items */
-void camel_store_summary_clear (CamelStoreSummary *summary);
+void           camel_store_summary_clear       (CamelStoreSummary *summary);
 
 /* lookup functions */
-gint camel_store_summary_count (CamelStoreSummary *summary);
-CamelStoreInfo *camel_store_summary_index (CamelStoreSummary *summary, gint index);
-CamelStoreInfo *camel_store_summary_path (CamelStoreSummary *summary, const gchar *path);
-GPtrArray *camel_store_summary_array (CamelStoreSummary *summary);
-void camel_store_summary_array_free (CamelStoreSummary *summary, GPtrArray *array);
-
-const gchar *camel_store_info_string (CamelStoreSummary *summary, const CamelStoreInfo *info, gint type);
-void camel_store_info_set_string (CamelStoreSummary *summary, CamelStoreInfo *info, gint type, const gchar 
*value);
+gint           camel_store_summary_count       (CamelStoreSummary *summary);
+CamelStoreInfo *
+               camel_store_summary_index       (CamelStoreSummary *summary,
+                                                gint index);
+CamelStoreInfo *
+               camel_store_summary_path        (CamelStoreSummary *summary,
+                                                const gchar *path);
+GPtrArray *    camel_store_summary_array       (CamelStoreSummary *summary);
+void           camel_store_summary_array_free  (CamelStoreSummary *summary,
+                                                GPtrArray *array);
+
+const gchar *  camel_store_info_string         (CamelStoreSummary *summary,
+                                                const CamelStoreInfo *info,
+                                                gint type);
+void           camel_store_info_set_string     (CamelStoreSummary *summary,
+                                                CamelStoreInfo *info,
+                                                gint type,
+                                                const gchar *value);
 
 /* helper macro's */
-#define camel_store_info_path(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo 
*)i, CAMEL_STORE_INFO_PATH))
-#define camel_store_info_name(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo 
*)i, CAMEL_STORE_INFO_NAME))
-
-void camel_store_summary_lock   (CamelStoreSummary *summary, CamelStoreSummaryLock lock);
-void camel_store_summary_unlock (CamelStoreSummary *summary, CamelStoreSummaryLock lock);
-
-struct _CamelFolderSummary;
-gboolean camel_store_summary_connect_folder_summary (CamelStoreSummary *summary, const gchar *path, struct 
_CamelFolderSummary *folder_summary);
-gboolean camel_store_summary_disconnect_folder_summary (CamelStoreSummary *summary, struct 
_CamelFolderSummary *folder_summary);
+#define camel_store_info_path(summary, info) \
+       (camel_store_info_string ( \
+               (CamelStoreSummary *) summary, \
+               (const CamelStoreInfo *) info, \
+               CAMEL_STORE_INFO_PATH))
+#define camel_store_info_name(summary, info) \
+       (camel_store_info_string ( \
+               (CamelStoreSummary *) summary, \
+               (const CamelStoreInfo *) info, \
+               CAMEL_STORE_INFO_NAME))
+
+void           camel_store_summary_lock        (CamelStoreSummary *summary,
+                                                CamelStoreSummaryLock lock);
+void           camel_store_summary_unlock      (CamelStoreSummary *summary,
+                                                CamelStoreSummaryLock lock);
+
+gboolean       camel_store_summary_connect_folder_summary
+                                               (CamelStoreSummary *summary,
+                                                const gchar *path,
+                                                struct _CamelFolderSummary *folder_summary);
+gboolean       camel_store_summary_disconnect_folder_summary
+                                               (CamelStoreSummary *summary,
+                                                struct _CamelFolderSummary *folder_summary);
 
 G_END_DECLS