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



commit d1e0fbc8d6d60bacbb751cd9caa51f51474740f2
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 3 12:31:29 2016 +0100

    Seal CamelFolderSummary properties + some API/function renames

 src/camel/camel-ews-folder.c  |   14 +++++++-------
 src/camel/camel-ews-summary.c |   24 ++++++++++++------------
 2 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index 9e0f27f..7b17563 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -1115,7 +1115,7 @@ ews_sync_mi_flags (CamelFolder *folder,
                        cancellable, &local_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);
 
        if (local_error) {
                camel_ews_store_maybe_disconnect (ews_store, local_error);
@@ -1359,7 +1359,7 @@ ews_synchronize_sync (CamelFolder *folder,
                success = ews_move_to_junk_folder (folder, junk_uids, cancellable, &local_error);
        g_slist_free_full (junk_uids, (GDestroyNotify) camel_pstring_free);
 
-       camel_folder_summary_save_to_db (folder_summary, NULL);
+       camel_folder_summary_save (folder_summary, NULL);
        camel_folder_summary_free_array (uids);
 
        if (local_error)
@@ -1809,7 +1809,7 @@ ews_folder_forget_all_mails (CamelEwsFolder *ews_folder)
 
        if (camel_folder_change_info_changed (changes)) {
                camel_folder_summary_touch (folder_summary);
-               camel_folder_summary_save_to_db (folder_summary, NULL);
+               camel_folder_summary_save (folder_summary, NULL);
                camel_folder_changed (folder, changes);
        }
 
@@ -1933,7 +1933,7 @@ ews_refresh_info_sync (CamelFolder *folder,
                camel_folder_summary_touch (folder_summary);
 
                if (camel_folder_change_info_changed (change_info)) {
-                       camel_folder_summary_save_to_db (folder_summary, NULL);
+                       camel_folder_summary_save (folder_summary, NULL);
                        /* Notify any listeners only once per 10 seconds, as such notify can cause UI update 
*/
                        if (g_get_monotonic_time () - last_folder_update_time >= 10 * G_USEC_PER_SEC) {
                                last_folder_update_time = g_get_monotonic_time ();
@@ -1947,10 +1947,10 @@ ews_refresh_info_sync (CamelFolder *folder,
 
        if (camel_folder_change_info_changed (change_info)) {
                camel_folder_summary_touch (folder_summary);
-               camel_folder_summary_save_to_db (folder_summary, NULL);
+               camel_folder_summary_save (folder_summary, NULL);
                camel_folder_changed (folder, change_info);
        } else {
-               camel_folder_summary_save_to_db (folder_summary, NULL);
+               camel_folder_summary_save (folder_summary, NULL);
        }
 
        camel_folder_change_info_free (change_info);
@@ -2520,7 +2520,7 @@ ews_folder_dispose (GObject *object)
                g_signal_handlers_disconnect_by_func (summary, G_CALLBACK (ews_folder_count_notify_cb), 
ews_folder);
 
                /* save changes, if there are any unsaved */
-               camel_folder_summary_save_to_db (summary, NULL);
+               camel_folder_summary_save (summary, NULL);
        }
 
        if (ews_folder->cache != NULL) {
diff --git a/src/camel/camel-ews-summary.c b/src/camel/camel-ews-summary.c
index 0ed7d4b..b79487d 100644
--- a/src/camel/camel-ews-summary.c
+++ b/src/camel/camel-ews-summary.c
@@ -42,8 +42,8 @@
 #define d(x)
 
 /*Prototypes*/
-static gboolean summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir);
-static CamelFIRecord * summary_header_to_db (CamelFolderSummary *s, GError **error);
+static gboolean summary_header_load (CamelFolderSummary *s, CamelFIRecord *mir);
+static CamelFIRecord * summary_header_save (CamelFolderSummary *s, GError **error);
 
 /*End of Prototypes*/
 
@@ -80,8 +80,8 @@ camel_ews_summary_class_init (CamelEwsSummaryClass *class)
 
        folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (class);
        folder_summary_class->message_info_type = CAMEL_TYPE_EWS_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
@@ -107,19 +107,19 @@ camel_ews_summary_new (struct _CamelFolder *folder)
 
        summary = g_object_new (CAMEL_TYPE_EWS_SUMMARY, "folder", folder, NULL);
 
-       camel_folder_summary_load_from_db (summary, NULL);
+       camel_folder_summary_load (summary, NULL);
 
        return summary;
 }
 
 static gboolean
-summary_header_from_db (CamelFolderSummary *s,
-                        CamelFIRecord *mir)
+summary_header_load (CamelFolderSummary *s,
+                    CamelFIRecord *mir)
 {
        CamelEwsSummary *ews_summary = CAMEL_EWS_SUMMARY (s);
        gchar *part;
 
-       if (!CAMEL_FOLDER_SUMMARY_CLASS (camel_ews_summary_parent_class)->summary_header_from_db (s, mir))
+       if (!CAMEL_FOLDER_SUMMARY_CLASS (camel_ews_summary_parent_class)->summary_header_load (s, mir))
                return FALSE;
 
        part = mir->bdata;
@@ -135,14 +135,14 @@ summary_header_from_db (CamelFolderSummary *s,
 }
 
 static CamelFIRecord *
-summary_header_to_db (CamelFolderSummary *s,
-                      GError **error)
+summary_header_save (CamelFolderSummary *s,
+                    GError **error)
 {
        CamelEwsSummary *ews_summary = CAMEL_EWS_SUMMARY (s);
        struct _CamelFIRecord *fir;
        gchar *sync_state;
 
-       fir = CAMEL_FOLDER_SUMMARY_CLASS (camel_ews_summary_parent_class)->summary_header_to_db (s, error);
+       fir = CAMEL_FOLDER_SUMMARY_CLASS (camel_ews_summary_parent_class)->summary_header_save (s, error);
        if (!fir)
                return NULL;
 
@@ -186,7 +186,7 @@ camel_ews_summary_add_message (CamelFolderSummary *summary,
 
        camel_folder_summary_add (summary, mi, FALSE);
        camel_folder_summary_touch (summary);
-       camel_folder_summary_save_to_db (summary, NULL);
+       camel_folder_summary_save (summary, NULL);
 
        g_object_unref (mi);
 


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