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().

diff --git a/addressbook/libebook-contacts/e-name-western-tables.h b/addressbook/libebook-contacts/e-name-western-tables.h
deleted file mode 100644 (file)
index e529252..0000000
--- a/addressbook/libebook-contacts/e-name-western-tables.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/* This file is generated by gen-western-table.py. DO NOT EDIT */
-static const gchar western_pfx_table[] = {
-  "mister\0"
-  "miss.\0"
-  "mr.\0"
-  "mrs.\0"
-  "ms.\0"
-  "miss\0"
-  "mr\0"
-  "mrs\0"
-  "ms\0"
-  "sir\0"
-  "professor\0"
-  "prof.\0"
-  "dr\0"
-  "dr.\0"
-  "doctor\0"
-  "judge\0"
-  "justice\0"
-  "chief justice\0"
-  "congressman\0"
-  "congresswoman\0"
-  "commander\0"
-  "lieutenant\0"
-  "lt.\0"
-  "colonel\0"
-  "col.\0"
-  "major\0"
-  "maj.\0"
-  "general\0"
-  "gen.\0"
-  "admiral\0"
-  "admr.\0"
-  "sergeant\0"
-  "sgt.\0"
-  "lord\0"
-  "lady\0"
-  "baron\0"
-  "baroness\0"
-  "duke\0"
-  "duchess\0"
-  "king\0"
-  "queen\0"
-  "prince\0"
-  "princess\0"
-  "the most honorable\0"
-  "the honorable\0"
-  "the reverend\0"
-  "his holiness\0"
-  "his eminence\0"
-  "his majesty\0"
-  "her majesty\0"
-  "his grace\0"
-  "her grace\0"
-  "president\0"
-  "vice president\0"
-  "secretary\0"
-  "undersecretary\0"
-  "consul\0"
-  "ambassador\0"
-  "senator\0"
-  "saint\0"
-  "st.\0"
-  "pastor\0"
-  "deacon\0"
-  "father\0"
-  "bishop\0"
-  "archbishop\0"
-  "cardinal\0"
-  "pope\0"
-  "reverend\0"
-  "rev.\0"
-  "rabbi\0"
-  "monsieur\0"
-  "m.\0"
-  "mademoiselle\0"
-  "melle\0"
-  "madame\0"
-  "mme\0"
-  "professeur\0"
-  "dauphin\0"
-  "dauphine\0"
-  "herr\0"
-  "frau\0"
-  "fraulein\0"
-  "fräulein\0"
-  "doktor\0"
-  "herr doktor\0"
-  "doktor frau\0"
-  "doktor frau doktor\0"
-  "frau doktor\0"
-  "senor\0"
-  "señor\0"
-  "senora\0"
-  "señora\0"
-  "sra.\0"
-  "senorita\0"
-  "señorita\0"
-  "srita.\0"
-};
-static const guint western_pfx_index[] = {
-  0,
-  7,
-  13,
-  17,
-  22,
-  26,
-  31,
-  34,
-  38,
-  41,
-  45,
-  55,
-  61,
-  64,
-  68,
-  75,
-  81,
-  89,
-  103,
-  115,
-  129,
-  139,
-  150,
-  154,
-  162,
-  167,
-  173,
-  178,
-  186,
-  191,
-  199,
-  205,
-  214,
-  219,
-  224,
-  229,
-  235,
-  244,
-  249,
-  257,
-  262,
-  268,
-  275,
-  284,
-  303,
-  317,
-  330,
-  343,
-  356,
-  368,
-  380,
-  390,
-  400,
-  410,
-  425,
-  435,
-  450,
-  457,
-  468,
-  476,
-  482,
-  486,
-  493,
-  500,
-  507,
-  514,
-  525,
-  534,
-  539,
-  548,
-  553,
-  559,
-  568,
-  571,
-  584,
-  590,
-  597,
-  601,
-  612,
-  620,
-  629,
-  634,
-  639,
-  648,
-  658,
-  665,
-  677,
-  689,
-  708,
-  720,
-  726,
-  733,
-  740,
-  748,
-  753,
-  762,
-  772,
-};
-
-static const gchar western_sfx_table[] = {
-  "junior\0"
-  "senior\0"
-  "jr\0"
-  "jr.\0"
-  "sr\0"
-  "sr.\0"
-  "i\0"
-  "ii\0"
-  "iii\0"
-  "iv\0"
-  "v\0"
-  "vi\0"
-  "vii\0"
-  "viii\0"
-  "ix\0"
-  "x\0"
-  "xi\0"
-  "xii\0"
-  "xiii\0"
-  "xiv\0"
-  "xv\0"
-  "xvi\0"
-  "xvii\0"
-  "xviii\0"
-  "xix\0"
-  "xx\0"
-  "xxi\0"
-  "xxii\0"
-  "phd\0"
-  "ms\0"
-  "md\0"
-  "m.d.\0"
-  "esq\0"
-  "esq.\0"
-  "esquire\0"
-};
-static const guint western_sfx_index[] = {
-  0,
-  7,
-  14,
-  17,
-  21,
-  24,
-  28,
-  30,
-  33,
-  37,
-  40,
-  42,
-  45,
-  49,
-  54,
-  57,
-  59,
-  62,
-  66,
-  71,
-  75,
-  78,
-  82,
-  87,
-  93,
-  97,
-  100,
-  104,
-  109,
-  113,
-  116,
-  119,
-  124,
-  128,
-  133,
-};
-
-static const gchar western_complex_last_table[] = {
-  "van\0"
-  "von\0"
-  "de\0"
-  "di\0"
-  "af\0"
-};
-static const guint western_complex_last_index[] = {
-  0,
-  4,
-  8,
-  11,
-  14,
-};
-

diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c
index 339a0f0..42c2f0e 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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