[evolution-mapi/wip/camel-more-gobject] Seal CamelFolderSummary properties + some API/function renames



commit 19fb7dd87383b980f355c073961ce95c323a6655
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 3 12:32:03 2016 +0100

    Seal CamelFolderSummary properties + some API/function renames

 src/camel/camel-mapi-folder-summary.c |   18 +++++++++---------
 src/camel/camel-mapi-folder.c         |    4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder-summary.c b/src/camel/camel-mapi-folder-summary.c
index 65c0327..56c6ce2 100644
--- a/src/camel/camel-mapi-folder-summary.c
+++ b/src/camel/camel-mapi-folder-summary.c
@@ -36,8 +36,8 @@
 #define CAMEL_MAPI_FOLDER_SUMMARY_VERSION (1)
 
 /*Prototypes*/
-static CamelFIRecord* mapi_summary_header_to_db (CamelFolderSummary *, GError **error);
-static gboolean mapi_summary_header_from_db (CamelFolderSummary *, CamelFIRecord *fir);
+static CamelFIRecord *mapi_summary_header_save (CamelFolderSummary *, GError **error);
+static gboolean mapi_summary_header_load (CamelFolderSummary *, CamelFIRecord *fir);
 
 /*End of Prototypes*/
 
@@ -50,8 +50,8 @@ camel_mapi_folder_summary_class_init (CamelMapiFolderSummaryClass *class)
 
        folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (class);
        folder_summary_class->message_info_type = CAMEL_TYPE_MAPI_MESSAGE_INFO;
-       folder_summary_class->summary_header_to_db = mapi_summary_header_to_db;
-       folder_summary_class->summary_header_from_db = mapi_summary_header_from_db;
+       folder_summary_class->summary_header_save = mapi_summary_header_save;
+       folder_summary_class->summary_header_load = mapi_summary_header_load;
 }
 
 static void
@@ -75,7 +75,7 @@ camel_mapi_folder_summary_new (CamelFolder *folder)
 
        summary = g_object_new (CAMEL_TYPE_MAPI_FOLDER_SUMMARY, "folder", folder, NULL);
 
-       if (!camel_folder_summary_load_from_db (summary, &local_error)) {
+       if (!camel_folder_summary_load (summary, &local_error)) {
                /* FIXME: Isn't this dangerous ? We clear the summary
                if it cannot be loaded, for some random reason.
                We need to pass the ex and find out why it is not loaded etc. ? */
@@ -89,7 +89,7 @@ camel_mapi_folder_summary_new (CamelFolder *folder)
 }
 
 static gboolean
-mapi_summary_header_from_db (CamelFolderSummary *summary, CamelFIRecord *fir)
+mapi_summary_header_load (CamelFolderSummary *summary, CamelFIRecord *fir)
 {
        CamelMapiFolderSummary *mapi_summary = CAMEL_MAPI_FOLDER_SUMMARY (summary);
        CamelFolderSummaryClass *folder_summary_class;
@@ -98,7 +98,7 @@ mapi_summary_header_from_db (CamelFolderSummary *summary, CamelFIRecord *fir)
        folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
                camel_mapi_folder_summary_parent_class);
 
-       if (!folder_summary_class->summary_header_from_db (summary, fir))
+       if (!folder_summary_class->summary_header_load (summary, fir))
                return FALSE;
 
        part = fir->bdata;
@@ -110,14 +110,14 @@ mapi_summary_header_from_db (CamelFolderSummary *summary, CamelFIRecord *fir)
 }
 
 static CamelFIRecord *
-mapi_summary_header_to_db (CamelFolderSummary *summary, GError **error)
+mapi_summary_header_save (CamelFolderSummary *summary, GError **error)
 {
        CamelFolderSummaryClass *folder_summary_class;
        struct _CamelFIRecord *fir;
 
        folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (camel_mapi_folder_summary_parent_class);
 
-       fir = folder_summary_class->summary_header_to_db (summary, error);
+       fir = folder_summary_class->summary_header_save (summary, error);
 
        if (!fir)
                return NULL;
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index efa4e6a..e8f0e30 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -894,7 +894,7 @@ camel_mapi_folder_fetch_summary (CamelFolder *folder, GCancellable *cancellable,
        if (mapi_error && *mapi_error)
                camel_mapi_store_maybe_disconnect (mapi_store, *mapi_error);
 
-       camel_folder_summary_save_to_db (camel_folder_get_folder_summary (folder), NULL);
+       camel_folder_summary_save (camel_folder_get_folder_summary (folder), NULL);
        camel_folder_thaw (folder);
 
        return status;
@@ -1042,7 +1042,7 @@ mapi_folder_dispose (GObject *object)
        CamelFolder *folder = CAMEL_FOLDER (object);
        CamelMapiFolder *mapi_folder = CAMEL_MAPI_FOLDER (object);
 
-       camel_folder_summary_save_to_db (camel_folder_get_folder_summary (folder), NULL);
+       camel_folder_summary_save (camel_folder_get_folder_summary (folder), NULL);
 
        if (mapi_folder->cache != NULL) {
                g_object_unref (mapi_folder->cache);


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