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

[Matthew Barnes <mbarnes src gnome org>]

commit e8d1ac926a0151b3f807eb9db97f8e4abe1df7c1
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Aug 24 07:24:07 2013 -0400

    Rename camel_imapx_status_response_get_mailbox().
    
    Rename to camel_imapx_status_response_get_mailbox_name().
    
    I'm working on an actual CamelMailbox class and don't want get_mailbox()
    function to be misleading.

 camel/camel-imapx-server.c              |   12 ++++++------
 camel/camel-imapx-status-response.c     |   16 ++++++++--------
 camel/camel-imapx-status-response.h     |    2 +-
 docs/reference/camel/camel-sections.txt |    2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index 85ff6f5..5d0e90a 100644
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -2198,7 +2198,7 @@ imapx_untagged_status (CamelIMAPXServer *is,
        CamelIMAPXStoreNamespace *ns;
        CamelIMAPXStore *store;
        CamelFolder *folder = NULL;
-       const gchar *mailbox;
+       const gchar *mailbox_name;
        guint32 uidvalidity;
        GError *local_error = NULL;
 
@@ -2209,22 +2209,22 @@ imapx_untagged_status (CamelIMAPXServer *is,
        if (response == NULL)
                return FALSE;
 
-       mailbox = camel_imapx_status_response_get_mailbox (response);
+       mailbox_name = camel_imapx_status_response_get_mailbox_name (response);
        uidvalidity = camel_imapx_status_response_get_uidvalidity (response);
 
        store = camel_imapx_server_ref_store (is);
 
        ns = camel_imapx_store_summary_namespace_find_by_mailbox (
-               store->summary, mailbox);
+               store->summary, mailbox_name);
 
        if (ns != NULL) {
                gchar *path_name;
 
                path_name = camel_imapx_store_summary_mailbox_to_path (
-                       store->summary, mailbox, ns->sep);
+                       store->summary, mailbox_name, ns->sep);
                c (is->tagprefix,
                        "Got folder path '%s' for full '%s'\n",
-                       path_name, mailbox);
+                       path_name, mailbox_name);
                if (path_name != NULL) {
                        folder = camel_store_get_folder_sync (
                                CAMEL_STORE (store), path_name,
@@ -2250,7 +2250,7 @@ imapx_untagged_status (CamelIMAPXServer *is,
        } else {
                c (is->tagprefix,
                        "Received STATUS for unknown folder '%s'\n",
-                       mailbox);
+                       mailbox_name);
        }
 
        g_object_unref (response);
diff --git a/camel/camel-imapx-status-response.c b/camel/camel-imapx-status-response.c
index 86d15ad..d560ca0 100644
--- a/camel/camel-imapx-status-response.c
+++ b/camel/camel-imapx-status-response.c
@@ -35,7 +35,7 @@
        ((obj), CAMEL_TYPE_IMAPX_STATUS_RESPONSE, CamelIMAPXStatusResponsePrivate))
 
 struct _CamelIMAPXStatusResponsePrivate {
-       gchar *mailbox;
+       gchar *mailbox_name;
        guint32 messages;
        guint32 recent;
        guint32 unseen;
@@ -56,7 +56,7 @@ imapx_status_response_finalize (GObject *object)
 
        priv = CAMEL_IMAPX_STATUS_RESPONSE_GET_PRIVATE (object);
 
-       g_free (priv->mailbox);
+       g_free (priv->mailbox_name);
 
        /* Chain up to parent's finalize() method. */
        G_OBJECT_CLASS (camel_imapx_status_response_parent_class)->
@@ -109,11 +109,11 @@ camel_imapx_status_response_new (CamelIMAPXStream *stream,
 
        response = g_object_new (CAMEL_TYPE_IMAPX_STATUS_RESPONSE, NULL);
 
-       /* 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 status attributes. */
@@ -208,7 +208,7 @@ fail:
 }
 
 /**
- * camel_imapx_status_response_get_mailbox:
+ * camel_imapx_status_response_get_mailbox_name:
  * @response: a #CamelIMAPXStatusResponse
  *
  * Returns the mailbox name for @response.
@@ -218,11 +218,11 @@ fail:
  * Since: 3.10
  **/
 const gchar *
-camel_imapx_status_response_get_mailbox (CamelIMAPXStatusResponse *response)
+camel_imapx_status_response_get_mailbox_name (CamelIMAPXStatusResponse *response)
 {
        g_return_val_if_fail (CAMEL_IS_IMAPX_STATUS_RESPONSE (response), NULL);
 
-       return response->priv->mailbox;
+       return response->priv->mailbox_name;
 }
 
 /**
diff --git a/camel/camel-imapx-status-response.h b/camel/camel-imapx-status-response.h
index 223fc79..3a346d0 100644
--- a/camel/camel-imapx-status-response.h
+++ b/camel/camel-imapx-status-response.h
@@ -75,7 +75,7 @@ CamelIMAPXStatusResponse *
                                        (CamelIMAPXStream *stream,
                                         GCancellable *cancellable,
                                         GError **error);
-const gchar *  camel_imapx_status_response_get_mailbox
+const gchar *  camel_imapx_status_response_get_mailbox_name
                                        (CamelIMAPXStatusResponse *response);
 guint32                camel_imapx_status_response_get_messages
                                        (CamelIMAPXStatusResponse *response);
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index bda6eb8..b967965 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -986,7 +986,7 @@ CamelIMAPXSettingsPrivate
 <TITLE>CamelIMAPXStatusResponse</TITLE>
 CamelIMAPXStatusResponse
 camel_imapx_status_response_new
-camel_imapx_status_response_get_mailbox
+camel_imapx_status_response_get_mailbox_name
 camel_imapx_status_response_get_messages
 camel_imapx_status_response_get_recent
 camel_imapx_status_response_get_unseen