[evolution-data-server] Remove camel_store_free_folder_info_full().

[Matthew Barnes <mbarnes src gnome org>]

commit 2beb9c724fd84caa85209779992c617683e7d7a0
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Sep 23 11:10:16 2013 -0400

    Remove camel_store_free_folder_info_full().
    
    Use camel_folder_info_free() instead.
    
    CamelStore's free_folder_info() method now defaults to an equivalent
    implementation, but even that is about to be removed since all known
    subclasses set the method to camel_store_free_folder_info_full().

 .../libebook-contacts/e-name-western-tables.h      |  290 --------------------
 camel/camel-imapx-store.c                          |    1 -
 camel/camel-store.c                                |   26 +--
 camel/camel-store.h                                |    3 -
 camel/camel-vee-store.c                            |    1 -
 camel/providers/local/camel-local-store.c          |    1 -
 camel/providers/local/camel-maildir-store.c        |    4 +-
 camel/providers/local/camel-mbox-store.c           |    1 -
 camel/providers/local/camel-spool-store.c          |    2 +-
 camel/providers/nntp/camel-nntp-store.c            |    1 -
 docs/reference/camel/camel-sections.txt            |    1 -
 11 files changed, 11 insertions(+), 320 deletions(-)
---
diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c
index 339a0f0..42c2f0e 100644
--- a/camel/camel-imapx-store.c
+++ b/camel/camel-imapx-store.c
@@ -2128,7 +2128,6 @@ camel_imapx_store_class_init (CamelIMAPXStoreClass *class)
        store_class->hash_folder_name = imapx_name_hash;
        store_class->equal_folder_name = imapx_name_equal;
        store_class->can_refresh_folder = imapx_can_refresh_folder;
-       store_class->free_folder_info = camel_store_free_folder_info_full;
        store_class->get_folder_sync = imapx_store_get_folder_sync;
        store_class->get_folder_info_sync = imapx_store_get_folder_info_sync;
        store_class->get_junk_folder_sync = imapx_store_get_junk_folder_sync;
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 6faf0f2..03b86b0 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -383,6 +383,13 @@ store_can_refresh_folder (CamelStore *store,
        return ((info->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_INBOX);
 }
 
+static void
+store_free_folder_info (CamelStore *store,
+                        CamelFolderInfo *fi)
+{
+       camel_folder_info_free (fi);
+}
+
 static CamelFolder *
 store_get_inbox_folder_sync (CamelStore *store,
                              GCancellable *cancellable,
@@ -471,8 +478,7 @@ store_synchronize_sync (CamelStore *store,
                        fi = next;
                }
 
-               if (root != NULL)
-                       camel_store_free_folder_info_full (store, root);
+               camel_folder_info_free (root);
        } else {
                /* sync only folders opened until now */
                folders = camel_object_bag_list (store->folders);
@@ -1231,6 +1237,7 @@ camel_store_class_init (CamelStoreClass *class)
        class->hash_folder_name = g_str_hash;
        class->equal_folder_name = g_str_equal;
        class->can_refresh_folder = store_can_refresh_folder;
+       class->free_folder_info = store_free_folder_info;
 
        class->get_inbox_folder_sync = store_get_inbox_folder_sync;
        class->get_junk_folder_sync = store_get_junk_folder_sync;
@@ -1653,21 +1660,6 @@ camel_store_free_folder_info (CamelStore *store,
 }
 
 /**
- * camel_store_free_folder_info_full:
- * @store: a #CamelStore
- * @fi: a #CamelFolderInfo as gotten via camel_store_get_folder_info()
- *
- * An implementation for #CamelStore::free_folder_info. Frees all
- * of the data.
- **/
-void
-camel_store_free_folder_info_full (CamelStore *store,
-                                   CamelFolderInfo *fi)
-{
-       camel_folder_info_free (fi);
-}
-
-/**
  * camel_folder_info_free:
  * @fi: a #CamelFolderInfo
  *
diff --git a/camel/camel-store.h b/camel/camel-store.h
index ddf66e8..2feb06b 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -314,9 +314,6 @@ void                camel_store_folder_renamed      (CamelStore *store,
 void           camel_store_folder_info_stale   (CamelStore *store);
 void           camel_store_free_folder_info    (CamelStore *store,
                                                 CamelFolderInfo *fi);
-void           camel_store_free_folder_info_full
-                                               (CamelStore *store,
-                                                CamelFolderInfo *fi);
 CamelFolderInfo *
                camel_folder_info_new           (void);
 void           camel_folder_info_free          (CamelFolderInfo *fi);
diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c
index c4e1c1b..57f48f5 100644
--- a/camel/camel-vee-store.c
+++ b/camel/camel-vee-store.c
@@ -521,7 +521,6 @@ camel_vee_store_class_init (CamelVeeStoreClass *class)
        service_class->get_name = vee_store_get_name;
 
        store_class = CAMEL_STORE_CLASS (class);
-       store_class->free_folder_info = camel_store_free_folder_info_full;
        store_class->get_folder_sync = vee_store_get_folder_sync;
        store_class->get_folder_info_sync = vee_store_get_folder_info_sync;
        store_class->get_junk_folder_sync = vee_store_get_junk_folder_sync;
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 62f3621..6cc5de5 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -686,7 +686,6 @@ camel_local_store_class_init (CamelLocalStoreClass *class)
 
        store_class = CAMEL_STORE_CLASS (class);
        store_class->can_refresh_folder = local_store_can_refresh_folder;
-       store_class->free_folder_info = camel_store_free_folder_info_full;
        store_class->get_folder_sync = local_store_get_folder_sync;
        store_class->get_folder_info_sync = local_store_get_folder_info_sync;
        store_class->get_inbox_folder_sync = local_store_get_inbox_folder_sync;
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index 49395f7..fb4c2de 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -770,8 +770,7 @@ maildir_store_get_folder_info_sync (CamelStore *store,
        return fi;
 
 fail:
-       if (fi)
-               camel_store_free_folder_info_full (store, fi);
+       camel_folder_info_free (fi);
 
        return NULL;
 }
@@ -894,7 +893,6 @@ camel_maildir_store_class_init (CamelMaildirStoreClass *class)
        store_class->hash_folder_name = maildir_store_hash_folder_name;
        store_class->equal_folder_name = maildir_store_equal_folder_name;
        store_class->create_folder_sync = maildir_store_create_folder_sync;
-       store_class->free_folder_info = camel_store_free_folder_info_full;
        store_class->get_folder_sync = maildir_store_get_folder_sync;
        store_class->get_folder_info_sync = maildir_store_get_folder_info_sync;
        store_class->get_inbox_folder_sync = maildir_store_get_inbox_sync;
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index ccf69e8..cc84ad7 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -1008,7 +1008,6 @@ camel_mbox_store_class_init (CamelMboxStoreClass *class)
        CamelLocalStoreClass *local_store_class;
 
        store_class = CAMEL_STORE_CLASS (class);
-       store_class->free_folder_info = camel_store_free_folder_info_full;
        store_class->get_folder_sync = mbox_store_get_folder_sync;
        store_class->get_folder_info_sync = mbox_store_get_folder_info_sync;
        store_class->create_folder_sync = mbox_store_create_folder_sync;
diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index b047671..9231eba 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -362,7 +362,7 @@ get_folder_info_elm (CamelStore *store,
        if (scan_dir (
                store, visited, path, top, flags,
                NULL, &fi, cancellable, error) == -1 && fi != NULL) {
-               camel_store_free_folder_info_full (store, fi);
+               camel_folder_info_free (fi);
                fi = NULL;
        }
 
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 695a7b7..7e3ea07 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -1712,7 +1712,6 @@ camel_nntp_store_class_init (CamelNNTPStoreClass *class)
 
        store_class = CAMEL_STORE_CLASS (class);
        store_class->can_refresh_folder = nntp_can_refresh_folder;
-       store_class->free_folder_info = camel_store_free_folder_info_full;
        store_class->create_folder_sync = nntp_store_create_folder_sync;
        store_class->delete_folder_sync = nntp_store_delete_folder_sync;
        store_class->rename_folder_sync = nntp_store_rename_folder_sync;
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 0244c58..3129512 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -2469,7 +2469,6 @@ camel_store_folder_opened
 camel_store_folder_renamed
 camel_store_folder_info_stale
 camel_store_free_folder_info
-camel_store_free_folder_info_full
 camel_folder_info_new
 camel_folder_info_free
 camel_folder_info_build