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



commit 9773fe5b895f6f6277e140ccf038aa394da1d4b9
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 3 12:32:37 2016 +0100

    Seal CamelFolderSummary properties + some API/function renames

 camel/camel-eas-folder.c  |    2 +-
 camel/camel-eas-store.c   |    3 +--
 camel/camel-eas-summary.c |   18 +++++++++---------
 camel/camel-eas-utils.c   |    4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/camel/camel-eas-folder.c b/camel/camel-eas-folder.c
index d1e8717..124c773 100644
--- a/camel/camel-eas-folder.c
+++ b/camel/camel-eas-folder.c
@@ -728,7 +728,7 @@ eas_refresh_info_sync (CamelFolder *folder, GCancellable *cancellable, GError **
                if (items_updated)
                        progress_data.fetched += camel_eas_utils_sync_updated_items (eas_folder, 
items_updated);
 
-                camel_folder_summary_save_to_db (camel_folder_get_folder_summary (folder), NULL);
+                camel_folder_summary_save (camel_folder_get_folder_summary (folder), NULL);
 
         } while (more_available);
 
diff --git a/camel/camel-eas-store.c b/camel/camel-eas-store.c
index 35deaac..8391a16 100644
--- a/camel/camel-eas-store.c
+++ b/camel/camel-eas-store.c
@@ -303,8 +303,7 @@ folder_info_from_store_summary (CamelEasStore *store, const gchar *top, guint32
                        continue;
 
                fi = camel_eas_utils_build_folder_info (store, l->data);
-               if (!camel_folder_summary_header_load_from_db (s, CAMEL_STORE (store),
-                                                              fi->full_name, NULL)) {
+               if (!camel_folder_summary_header_load (s, CAMEL_STORE (store), fi->full_name, NULL)) {
                        fi->unread = camel_folder_summary_get_unread_count (s);
                        fi->total = camel_folder_summary_get_saved_count (s);
                }
diff --git a/camel/camel-eas-summary.c b/camel/camel-eas-summary.c
index e497ff0..be5ca02 100644
--- a/camel/camel-eas-summary.c
+++ b/camel/camel-eas-summary.c
@@ -47,8 +47,8 @@
 #define SUM_DB_RETTYPE gboolean
 #define SUM_DB_RET_OK TRUE
 #define SUM_DB_RET_ERR FALSE
-static SUM_DB_RETTYPE summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir);
-static CamelFIRecord * summary_header_to_db (CamelFolderSummary *s, GError **error);
+static SUM_DB_RETTYPE summary_header_load (CamelFolderSummary *s, CamelFIRecord *mir);
+static CamelFIRecord *summary_header_save (CamelFolderSummary *s, GError **error);
 
 /*End of Prototypes*/
 
@@ -76,8 +76,8 @@ camel_eas_summary_class_init (CamelEasSummaryClass *class)
 
        folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (class);
        folder_summary_class->message_info_type = CAMEL_TYPE_EAS_MESSAGE_INFO;
-       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->summary_header_save = summary_header_save;
+       folder_summary_class->summary_header_load = summary_header_load;
 }
 
 static void
@@ -102,18 +102,18 @@ camel_eas_summary_new (struct _CamelFolder *folder, const gchar *filename)
        summary = g_object_new (CAMEL_TYPE_EAS_SUMMARY,
                                "folder", folder, NULL);
 
-       camel_folder_summary_load_from_db (summary, NULL);
+       camel_folder_summary_load (summary, NULL);
 
        return summary;
 }
 
 static SUM_DB_RETTYPE
-summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir)
+summary_header_load (CamelFolderSummary *s, CamelFIRecord *mir)
 {
        CamelEasSummary *gms = CAMEL_EAS_SUMMARY (s);
        gchar *part;
 
-       if (CAMEL_FOLDER_SUMMARY_CLASS (camel_eas_summary_parent_class)->summary_header_from_db (s, mir) == 
SUM_DB_RET_ERR)
+       if (CAMEL_FOLDER_SUMMARY_CLASS (camel_eas_summary_parent_class)->summary_header_load (s, mir) == 
SUM_DB_RET_ERR)
                return SUM_DB_RET_ERR;
 
        part = mir->bdata;
@@ -130,12 +130,12 @@ summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir)
 }
 
 static CamelFIRecord *
-summary_header_to_db (CamelFolderSummary *s, GError **error)
+summary_header_save (CamelFolderSummary *s, GError **error)
 {
        CamelEasSummary *ims = CAMEL_EAS_SUMMARY(s);
        struct _CamelFIRecord *fir;
 
-       fir = CAMEL_FOLDER_SUMMARY_CLASS (camel_eas_summary_parent_class)->summary_header_to_db (s, error);
+       fir = CAMEL_FOLDER_SUMMARY_CLASS (camel_eas_summary_parent_class)->summary_header_save (s, error);
        if (!fir)
                return NULL;
 
diff --git a/camel/camel-eas-utils.c b/camel/camel-eas-utils.c
index e5f09ba..8fd0239 100644
--- a/camel/camel-eas-utils.c
+++ b/camel/camel-eas-utils.c
@@ -376,7 +376,7 @@ camel_eas_utils_sync_updated_items (CamelEasFolder *eas_folder, GSList *items_up
                count++;
        }
 
-       camel_folder_summary_save_to_db (folder_summary, NULL);
+       camel_folder_summary_save (folder_summary, NULL);
        camel_folder_changed ((CamelFolder *) eas_folder, ci);
        camel_folder_change_info_free (ci);
        g_slist_free (items_updated);
@@ -458,7 +458,7 @@ camel_eas_utils_sync_created_items (CamelEasFolder *eas_folder, GSList *items_cr
                count++;
        }
 
-       camel_folder_summary_save_to_db (folder_summary, NULL);
+       camel_folder_summary_save (folder_summary, NULL);
        camel_folder_changed ((CamelFolder *) eas_folder, ci);
        camel_folder_change_info_free (ci);
        g_slist_free (items_created);


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