[telepathy-mission-control/master] McdAccount: make parameter accessors internal

[Simon McVittie]

mcd_account_get_parameters is misleadingly named, make it internal as
_mcd_account_dup_parameters (it returns a new hash table).

mcd_account_check_parameters, mcd_account_get_parameter are never used
outside mcd-account.c so they can be static.
---
 src/mcd-account-connection.c |    2 +-
 src/mcd-account-priv.h       |    2 +
 src/mcd-account.c            |   52 +++++++++++++++++++++--------------------
 src/mcd-account.h            |    5 ----
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/mcd-account-connection.c b/src/mcd-account-connection.c
index d0574e7..f1d55ec 100644
--- a/src/mcd-account-connection.c
+++ b/src/mcd-account-connection.c
@@ -69,7 +69,7 @@ _mcd_account_connection_begin (McdAccount *account)
     /* run the handlers */
     ctx = g_malloc (sizeof (McdAccountConnectionContext));
     ctx->i_filter = 0;
-    ctx->params = mcd_account_get_parameters (account);
+    ctx->params = _mcd_account_dup_parameters (account);
     _mcd_account_set_connection_context (account, ctx);
     mcd_account_connection_proceed (account, TRUE);
 }
diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h
index 781141d..6d9151b 100644
--- a/src/mcd-account-priv.h
+++ b/src/mcd-account-priv.h
@@ -153,5 +153,7 @@ void _mcd_account_set_connection_context (McdAccount *self,
 G_GNUC_INTERNAL void _mcd_account_connection_context_free
     (McdAccountConnectionContext *c);
 
+G_GNUC_INTERNAL GHashTable *_mcd_account_dup_parameters (McdAccount *account);
+
 #endif /* __MCD_ACCOUNT_PRIV_H__ */
 
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 696c73e..5e130d0 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -336,6 +336,8 @@ get_parameter (McdAccount *account, const gchar *name, GValue *value)
     return TRUE;
 }
 
+static gboolean mcd_account_check_parameters (McdAccount *account);
+
 static void on_manager_ready (McdManager *manager, const GError *error,
                               gpointer user_data)
 {
@@ -810,7 +812,7 @@ get_parameters (TpSvcDBusProperties *self, const gchar *name, GValue *value)
     McdAccount *account = MCD_ACCOUNT (self);
     GHashTable *parameters;
 
-    parameters = mcd_account_get_parameters (account);
+    parameters = _mcd_account_dup_parameters (account);
     g_value_init (value, TP_HASH_TYPE_STRING_VARIANT_MAP);
     g_value_take_boxed (value, parameters);
 }
@@ -1153,7 +1155,25 @@ account_remove (McSvcAccount *self, DBusGMethodInvocation *context)
     mc_svc_account_return_from_remove (context);
 }
 
-gboolean
+/*
+ * mcd_account_get_parameter:
+ * @account: the #McdAccount.
+ * @name: the parameter name.
+ * @value: a initialized #GValue to receive the parameter value, or %NULL.
+ *
+ * Get the @name parameter for @account.
+ *
+ * Returns: %TRUE if found, %FALSE otherwise.
+ */
+static gboolean
+mcd_account_get_parameter (McdAccount *account, const gchar *name,
+                           GValue *value)
+{
+    return MCD_ACCOUNT_GET_CLASS (account)->get_parameter (account, name,
+                                                           value);
+}
+
+static gboolean
 mcd_account_check_parameters (McdAccount *account)
 {
     McdAccountPrivate *priv = account->priv;
@@ -1350,7 +1370,7 @@ account_update_parameters (McSvcAccount *self, GHashTable *set,
     mcd_account_unset_parameters (account, unset);
 
     /* emit the PropertiesChanged signal */
-    parameters = mcd_account_get_parameters (account);
+    parameters = _mcd_account_dup_parameters (account);
     g_value_init (&value, TP_HASH_TYPE_STRING_VARIANT_MAP);
     g_value_take_boxed (&value, parameters);
     mcd_account_changed_property (account, "Parameters", &value);
@@ -1788,16 +1808,16 @@ add_parameter (McdAccount *account, const TpConnectionManagerParam *param,
         tp_g_value_slice_free (value);
 }
 
-/**
- * mcd_account_get_parameters:
+/*
+ * _mcd_account_dup_parameters:
  * @account: the #McdAccount.
  *
  * Get the parameters set for this account.
  *
- * Returns: a #GHashTable containing the account parameters.
+ * Returns: a newly allocated #GHashTable containing the account parameters.
  */
 GHashTable *
-mcd_account_get_parameters (McdAccount *account)
+_mcd_account_dup_parameters (McdAccount *account)
 {
     McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (account);
     const TpConnectionManagerParam *param;
@@ -1821,24 +1841,6 @@ mcd_account_get_parameters (McdAccount *account)
 }
 
 /**
- * mcd_account_get_parameter:
- * @account: the #McdAccount.
- * @name: the parameter name.
- * @value: a initialized #GValue to receive the parameter value, or %NULL.
- *
- * Get the @name parameter for @account.
- *
- * Returns: %TRUE if found, %FALSE otherwise.
- */
-gboolean
-mcd_account_get_parameter (McdAccount *account, const gchar *name,
-                           GValue *value)
-{
-    return MCD_ACCOUNT_GET_CLASS (account)->get_parameter (account, name,
-                                                           value);
-}
-
-/**
  * mcd_account_request_presence:
  * @account: the #McdAccount.
  * @presence: a #TpConnectionPresenceType.
diff --git a/src/mcd-account.h b/src/mcd-account.h
index c29669e..ec518dd 100644
--- a/src/mcd-account.h
+++ b/src/mcd-account.h
@@ -92,11 +92,6 @@ gboolean mcd_account_is_enabled (McdAccount *account);
 const gchar *mcd_account_get_manager_name (McdAccount *account);
 const gchar *mcd_account_get_protocol_name (McdAccount *account);
 
-GHashTable *mcd_account_get_parameters (McdAccount *account);
-gboolean mcd_account_check_parameters (McdAccount *account);
-gboolean mcd_account_get_parameter (McdAccount *account, const gchar *name,
-                                    GValue *value);
-
 void mcd_account_request_presence (McdAccount *account,
 				   TpConnectionPresenceType type,
 				   const gchar *status, const gchar *message);
-- 
1.5.6.5