[telepathy-glib/master] account: renaming some presence getters to be more consistent with property names

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 docs/reference/telepathy-glib-sections.txt |   12 ++++++------
 telepathy-glib/account.c                   |   24 ++++++++++++------------
 telepathy-glib/account.h                   |   12 ++++++------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 04624a6..d709cc0 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -3019,12 +3019,12 @@ tp_account_set_connect_automatically_finish
 tp_account_get_has_been_online
 tp_account_get_connection_status
 tp_account_get_connection_status_reason
-tp_account_get_presence_type
-tp_account_get_presence_status
-tp_account_get_presence_message
-tp_account_get_requested_presence_type
-tp_account_get_requested_presence_status
-tp_account_get_requested_presence_message
+tp_account_get_presence
+tp_account_get_status
+tp_account_get_status_message
+tp_account_get_requested_presence
+tp_account_get_requested_status
+tp_account_get_requested_status_message
 tp_account_get_parameters
 tp_account_get_nickname
 tp_account_set_nickname_async
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 8402138..fe02b07 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -1803,7 +1803,7 @@ tp_account_get_connection_status_reason (TpAccount *account)
 }
 
 /**
- * tp_account_get_presence_type:
+ * tp_account_get_presence:
  * @account: a #TpAccount
  *
  * Gets the type from the CurrentPresence parameter on @account.
@@ -1811,13 +1811,13 @@ tp_account_get_connection_status_reason (TpAccount *account)
  * Returns: the type from the CurrentPresence parameter on @account
  */
 TpConnectionPresenceType
-tp_account_get_presence_type (TpAccount *account)
+tp_account_get_presence (TpAccount *account)
 {
   return account->priv->presence;
 }
 
 /**
- * tp_account_get_presence_status:
+ * tp_account_get_status:
  * @account: a #TpAccount
  *
  * Gets the status from the CurrentPresence parameter on @account.
@@ -1825,13 +1825,13 @@ tp_account_get_presence_type (TpAccount *account)
  * Returns: the status from the CurrentPresence parameter on @account
  */
 const gchar *
-tp_account_get_presence_status (TpAccount *account)
+tp_account_get_status (TpAccount *account)
 {
   return account->priv->status;
 }
 
 /**
- * tp_account_get_presence_message:
+ * tp_account_get_status_message:
  * @account: a #TpAccount
  *
  * Gets the message from the CurrentPresence parameter on @account.
@@ -1839,13 +1839,13 @@ tp_account_get_presence_status (TpAccount *account)
  * Returns: the message from the CurrentPresence parameter on @account
  */
 const gchar *
-tp_account_get_presence_message (TpAccount *account)
+tp_account_get_status_message (TpAccount *account)
 {
   return account->priv->message;
 }
 
 /**
- * tp_account_get_requested_presence_type:
+ * tp_account_get_requested_presence:
  * @account: a #TpAccount
  *
  * Gets the presence from the RequestedPresence parameter on @account.
@@ -1853,13 +1853,13 @@ tp_account_get_presence_message (TpAccount *account)
  * Returns: the presence from the RequestedPresence parameter on @account
  */
 TpConnectionPresenceType
-tp_account_get_requested_presence_type (TpAccount *account)
+tp_account_get_requested_presence (TpAccount *account)
 {
   return account->priv->requested_presence;
 }
 
 /**
- * tp_account_get_requested_presence_status:
+ * tp_account_get_requested_status:
  * @account: a #TpAccount
  *
  * Gets the status from the RequestedPresence parameter on @account.
@@ -1867,13 +1867,13 @@ tp_account_get_requested_presence_type (TpAccount *account)
  * Returns: the status from the RequestedPresence parameter on @account
  */
 const gchar *
-tp_account_get_requested_presence_status (TpAccount *account)
+tp_account_get_requested_status (TpAccount *account)
 {
   return account->priv->requested_status;
 }
 
 /**
- * tp_account_get_requested_presence_message:
+ * tp_account_get_requested_status_message:
  * @account: a #TpAccount
  *
  * Gets the message from the RequestedPresence parameter on @account.
@@ -1881,7 +1881,7 @@ tp_account_get_requested_presence_status (TpAccount *account)
  * Returns: the message from the RequestedPresence parameter on @account
  */
 const gchar *
-tp_account_get_requested_presence_message (TpAccount *account)
+tp_account_get_requested_status_message (TpAccount *account)
 {
   return account->priv->requested_message;
 }
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index 7e705bc..dbbebe1 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -156,18 +156,18 @@ TpConnectionStatus tp_account_get_connection_status (TpAccount *account);
 TpConnectionStatusReason tp_account_get_connection_status_reason (
     TpAccount *account);
 
-TpConnectionPresenceType tp_account_get_presence_type (TpAccount *account);
+TpConnectionPresenceType tp_account_get_presence (TpAccount *account);
 
-const gchar *tp_account_get_presence_status (TpAccount *account);
+const gchar *tp_account_get_status (TpAccount *account);
 
-const gchar *tp_account_get_presence_message (TpAccount *account);
+const gchar *tp_account_get_status_message (TpAccount *account);
 
-TpConnectionPresenceType tp_account_get_requested_presence_type (
+TpConnectionPresenceType tp_account_get_requested_presence (
     TpAccount *account);
 
-const gchar *tp_account_get_requested_presence_status (TpAccount *account);
+const gchar *tp_account_get_requested_status (TpAccount *account);
 
-const gchar *tp_account_get_requested_presence_message (TpAccount *account);
+const gchar *tp_account_get_requested_status_message (TpAccount *account);
 
 const GHashTable *tp_account_get_parameters (TpAccount *account);
 
-- 
1.5.6.5