2 files changed, 10 insertions, 74 deletions

diff --git a/libempathy/empathy-account.c b/libempathy/empathy-account.c
index ef377427d..91edaed66 100644
--- a/libempathy/empathy-account.c
+++ b/libempathy/empathy-account.c
@@ -653,79 +653,28 @@ empathy_account_get_icon_name (EmpathyAccount *account)
   return priv->icon_name;
 }
 
-gboolean
-empathy_account_is_enabled (EmpathyAccount *account)
+const GHashTable *
+empathy_account_get_parameters (EmpathyAccount *account)
 {
   EmpathyAccountPriv *priv = GET_PRIV (account);
 
-  return priv->enabled;
-}
-
-void
-empathy_account_unset_param (EmpathyAccount *account, const gchar *param)
-{
-  //EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  //mc_account_unset_param (priv->mc_account, param);
+  return priv->parameters;
 }
 
-const gchar *
-empathy_account_get_param_string (EmpathyAccount *account, const gchar *param)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  return tp_asv_get_string (priv->parameters, param);
-}
-
-gint
-empathy_account_get_param_int (EmpathyAccount *account, const gchar *param)
+gboolean
+empathy_account_is_enabled (EmpathyAccount *account)
 {
   EmpathyAccountPriv *priv = GET_PRIV (account);
 
-  return tp_asv_get_int32 (priv->parameters, param, NULL);
+  return priv->enabled;
 }
 
 gboolean
-empathy_account_get_param_boolean (EmpathyAccount *account, const gchar *param)
+empathy_account_is_ready (EmpathyAccount *account)
 {
   EmpathyAccountPriv *priv = GET_PRIV (account);
 
-  return tp_asv_get_boolean (priv->parameters, param, NULL);
-}
-
-void
-empathy_account_set_param_string (EmpathyAccount *account,
-  const gchar *param,
-  const gchar *value)
-{
-  //EmpathyAccountPriv *priv = GET_PRIV (account);
-  //mc_account_set_param_string (priv->mc_account, param, value);
-}
-
-void
-empathy_account_set_param_int (EmpathyAccount *account,
-  const gchar *param,
-  gint value)
-{
-  //EmpathyAccountPriv *priv = GET_PRIV (account);
-  //mc_account_set_param_int (priv->mc_account, param, value);
-}
-
-void
-empathy_account_set_param_boolean (EmpathyAccount *account,
-  const gchar *param,
-  gboolean value)
-{
-  //EmpathyAccountPriv *priv = GET_PRIV (account);
-  //mc_account_set_param_boolean (priv->mc_account, param, value);
-}
-
-void
-empathy_account_set_display_name (EmpathyAccount *account,
-    const gchar *display_name)
-{
-  //EmpathyAccountPriv *priv = GET_PRIV (account);
-  //mc_account_set_display_name (priv->mc_account, display_name);
+  return priv->ready;
 }
 
 
diff --git a/libempathy/empathy-account.h b/libempathy/empathy-account.h
index 252c959d2..efc8df713 100644
--- a/libempathy/empathy-account.h
+++ b/libempathy/empathy-account.h
@@ -68,21 +68,6 @@ void empathy_account_set_enabled (EmpathyAccount *account,
   gboolean enabled);
 gboolean empathy_account_is_enabled (EmpathyAccount *account);
 
-void empathy_account_unset_param (EmpathyAccount *account, const gchar *param);
-const gchar *empathy_account_get_param_string (EmpathyAccount *account,
-    const gchar *param);
-gint empathy_account_get_param_int (EmpathyAccount *account,
-    const gchar *param);
-gboolean empathy_account_get_param_boolean (EmpathyAccount *account,
-    const gchar *param);
-
-void empathy_account_set_param_string (EmpathyAccount *account,
-    const gchar *param, const gchar *value);
-void empathy_account_set_param_int (EmpathyAccount *account,
-    const gchar *param, gint value);
-void empathy_account_set_param_boolean (EmpathyAccount *account,
-    const gchar *param, gboolean value);
-
 gboolean empathy_account_is_valid (EmpathyAccount *account);
 gboolean empathy_account_is_ready (EmpathyAccount *account);
 
@@ -95,6 +80,8 @@ EmpathyAccount *empathy_account_new (TpDBusDaemon *bus_daemon,
 void empathy_account_request_presence (EmpathyAccount *account,
   TpConnectionPresenceType type, const gchar *status, const gchar *message);
 
+const GHashTable *empathy_account_get_parameters (EmpathyAccount *account);
+
 
 G_END_DECLS