[evolution-data-server] Rename camel_imapx_list_response_get_mailbox().

[Matthew Barnes <mbarnes src gnome org>]

commit 08a529e0acb65135169186c868352eeae5210b73
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Aug 24 07:18:57 2013 -0400

    Rename camel_imapx_list_response_get_mailbox().
    
    Rename to camel_imapx_list_response_get_mailbox_name().
    
    I'm working on an actual CamelMailbox class and don't want get_mailbox()
    functions to be misleading.

 camel/camel-imapx-list-response.c       |   40 +++++++++++++++---------------
 camel/camel-imapx-list-response.h       |    2 +-
 camel/camel-imapx-server.c              |   10 ++++----
 camel/camel-imapx-store.c               |    8 +++---
 docs/reference/camel/camel-sections.txt |    2 +-
 5 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/camel/camel-imapx-list-response.c b/camel/camel-imapx-list-response.c
index 1f43863..f2fc8d8 100644
--- a/camel/camel-imapx-list-response.c
+++ b/camel/camel-imapx-list-response.c
@@ -39,7 +39,7 @@
        ((obj), CAMEL_TYPE_IMAPX_LIST_RESPONSE, CamelIMAPXListResponsePrivate))
 
 struct _CamelIMAPXListResponsePrivate {
-       gchar *mailbox;
+       gchar *mailbox_name;
        gchar separator;
        GQueue attributes;
        GHashTable *extended_items;
@@ -57,7 +57,7 @@ imapx_list_response_finalize (GObject *object)
 
        priv = CAMEL_IMAPX_LIST_RESPONSE_GET_PRIVATE (object);
 
-       g_free (priv->mailbox);
+       g_free (priv->mailbox_name);
 
        /* Flag strings are interned, so don't free them. */
        g_queue_clear (&priv->attributes);
@@ -156,7 +156,7 @@ imapx_list_response_parse_oldname (CamelIMAPXStream *stream,
        camel_imapx_token_t tok;
        guchar *token;
        guint len;
-       gchar *mailbox = NULL;
+       gchar *mailbox_name = NULL;
 
        tok = camel_imapx_stream_token (
                stream, &token, &len, cancellable, error);
@@ -169,8 +169,8 @@ imapx_list_response_parse_oldname (CamelIMAPXStream *stream,
                goto fail;
        }
 
-       mailbox = camel_imapx_parse_mailbox (stream, cancellable, error);
-       if (mailbox == NULL)
+       mailbox_name = camel_imapx_parse_mailbox (stream, cancellable, error);
+       if (mailbox_name == NULL)
                goto fail;
 
        tok = camel_imapx_stream_token (
@@ -184,10 +184,10 @@ imapx_list_response_parse_oldname (CamelIMAPXStream *stream,
                goto fail;
        }
 
-       return g_variant_new_string (mailbox);
+       return g_variant_new_string (mailbox_name);
 
 fail:
-       g_free (mailbox);
+       g_free (mailbox_name);
 
        return NULL;
 }
@@ -335,11 +335,11 @@ camel_imapx_list_response_new (CamelIMAPXStream *stream,
        else
                response->priv->separator = '\0';
 
-       /* Parse mailbox. */
+       /* Parse mailbox name. */
 
-       response->priv->mailbox =
+       response->priv->mailbox_name =
                camel_imapx_parse_mailbox (stream, cancellable, error);
-       if (response->priv->mailbox == NULL)
+       if (response->priv->mailbox_name == NULL)
                goto fail;
 
        /* Parse extended info (optional). */
@@ -400,11 +400,11 @@ fail:
 guint
 camel_imapx_list_response_hash (CamelIMAPXListResponse *response)
 {
-       const gchar *mailbox;
+       const gchar *mailbox_name;
 
-       mailbox = camel_imapx_list_response_get_mailbox (response);
+       mailbox_name = camel_imapx_list_response_get_mailbox_name (response);
 
-       return g_str_hash (mailbox);
+       return g_str_hash (mailbox_name);
 }
 
 /**
@@ -426,8 +426,8 @@ camel_imapx_list_response_equal (CamelIMAPXListResponse *response_a,
        const gchar *mailbox_a;
        const gchar *mailbox_b;
 
-       mailbox_a = camel_imapx_list_response_get_mailbox (response_a);
-       mailbox_b = camel_imapx_list_response_get_mailbox (response_b);
+       mailbox_a = camel_imapx_list_response_get_mailbox_name (response_a);
+       mailbox_b = camel_imapx_list_response_get_mailbox_name (response_b);
 
        return g_str_equal (mailbox_a, mailbox_b);
 }
@@ -452,14 +452,14 @@ camel_imapx_list_response_compare (CamelIMAPXListResponse *response_a,
        const gchar *mailbox_a;
        const gchar *mailbox_b;
 
-       mailbox_a = camel_imapx_list_response_get_mailbox (response_a);
-       mailbox_b = camel_imapx_list_response_get_mailbox (response_b);
+       mailbox_a = camel_imapx_list_response_get_mailbox_name (response_a);
+       mailbox_b = camel_imapx_list_response_get_mailbox_name (response_b);
 
        return g_strcmp0 (mailbox_a, mailbox_b);
 }
 
 /**
- * camel_imapx_list_response_get_mailbox:
+ * camel_imapx_list_response_get_mailbox_name:
  * @response: a #CamelIMAPXListResponse
  *
  * Returns the mailbox name for @response.
@@ -469,11 +469,11 @@ camel_imapx_list_response_compare (CamelIMAPXListResponse *response_a,
  * Since: 3.10
  **/
 const gchar *
-camel_imapx_list_response_get_mailbox (CamelIMAPXListResponse *response)
+camel_imapx_list_response_get_mailbox_name (CamelIMAPXListResponse *response)
 {
        g_return_val_if_fail (CAMEL_IS_IMAPX_LIST_RESPONSE (response), NULL);
 
-       return response->priv->mailbox;
+       return response->priv->mailbox_name;
 }
 
 /**
diff --git a/camel/camel-imapx-list-response.h b/camel/camel-imapx-list-response.h
index c28eecc..9687448 100644
--- a/camel/camel-imapx-list-response.h
+++ b/camel/camel-imapx-list-response.h
@@ -95,7 +95,7 @@ gboolean      camel_imapx_list_response_equal
 gint           camel_imapx_list_response_compare
                                        (CamelIMAPXListResponse *response_a,
                                         CamelIMAPXListResponse *response_b);
-const gchar *  camel_imapx_list_response_get_mailbox
+const gchar *  camel_imapx_list_response_get_mailbox_name
                                        (CamelIMAPXListResponse *response);
 gchar          camel_imapx_list_response_get_separator
                                        (CamelIMAPXListResponse *response);
diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index 5a0020a..85ff6f5 100644
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -1990,7 +1990,7 @@ imapx_untagged_list (CamelIMAPXServer *is,
        CamelIMAPXListResponse *response;
        CamelIMAPXJob *job = NULL;
        ListData *data = NULL;
-       const gchar *mailbox;
+       const gchar *mailbox_name;
        gchar separator;
 
        g_return_val_if_fail (CAMEL_IS_IMAPX_SERVER (is), FALSE);
@@ -1999,10 +1999,10 @@ imapx_untagged_list (CamelIMAPXServer *is,
        if (response == NULL)
                return FALSE;
 
-       mailbox = camel_imapx_list_response_get_mailbox (response);
+       mailbox_name = camel_imapx_list_response_get_mailbox_name (response);
        separator = camel_imapx_list_response_get_separator (response);
 
-       job = imapx_match_active_job (is, IMAPX_JOB_LIST, mailbox);
+       job = imapx_match_active_job (is, IMAPX_JOB_LIST, mailbox_name);
 
        data = camel_imapx_job_get_data (job);
        g_return_val_if_fail (data != NULL, FALSE);
@@ -2010,9 +2010,9 @@ imapx_untagged_list (CamelIMAPXServer *is,
        // TODO: we want to make sure the names match?
 
        if (data->flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED) {
-               c (is->tagprefix, "lsub: '%s' (%c)\n", mailbox, separator);
+               c (is->tagprefix, "lsub: '%s' (%c)\n", mailbox_name, separator);
        } else {
-               c (is->tagprefix, "list: '%s' (%c)\n", mailbox, separator);
+               c (is->tagprefix, "list: '%s' (%c)\n", mailbox_name, separator);
        }
 
        if (job && !g_hash_table_contains (data->folders, response)) {
diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c
index 7ae70dc..1aeba6e 100644
--- a/camel/camel-imapx-store.c
+++ b/camel/camel-imapx-store.c
@@ -1087,12 +1087,12 @@ add_folder_to_summary (CamelIMAPXStore *imapx_store,
 {
        CamelIMAPXStoreInfo *si;
        CamelFolderInfo *fi;
-       const gchar *mailbox;
+       const gchar *mailbox_name;
        gchar separator;
        CamelStoreInfoFlags flags;
        CamelStoreInfoFlags new_flags;
 
-       mailbox = camel_imapx_list_response_get_mailbox (response);
+       mailbox_name = camel_imapx_list_response_get_mailbox_name (response);
        separator = camel_imapx_list_response_get_separator (response);
 
        /* XXX The flags type transforms from CamelStoreInfoFlags
@@ -1101,14 +1101,14 @@ add_folder_to_summary (CamelIMAPXStore *imapx_store,
        flags = camel_imapx_list_response_get_summary_flags (response);
 
        if (update_for_lsub) {
-               fi = g_hash_table_lookup (table, mailbox);
+               fi = g_hash_table_lookup (table, mailbox_name);
                if (fi != NULL)
                        fi->flags |= CAMEL_STORE_INFO_FOLDER_SUBSCRIBED;
                return;
        }
 
        si = camel_imapx_store_summary_add_from_mailbox (
-               imapx_store->summary, mailbox, separator);
+               imapx_store->summary, mailbox_name, separator);
        if (si == NULL)
                return;
 
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 28d6a60..bda6eb8 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -827,7 +827,7 @@ camel_imapx_list_response_new
 camel_imapx_list_response_hash
 camel_imapx_list_response_equal
 camel_imapx_list_response_compare
-camel_imapx_list_response_get_mailbox
+camel_imapx_list_response_get_mailbox_name
 camel_imapx_list_response_get_separator
 CAMEL_IMAPX_LIST_ATTR_NOINFERIORS
 CAMEL_IMAPX_LIST_ATTR_NOSELECT