[Telepathy-commits] [telepathy-mission-control/master] Fix prototype for the account_new virtual method.

[Alberto Mardegan]

---
 src/mcd-account-manager.c |   14 +++++++++++---
 src/mcd-account-manager.h |    2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 1b45b99..76a9e6e 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -97,6 +97,14 @@ enum
 
 static guint write_conf_id = 0;
 
+static McdAccount *
+account_new (McdAccountManager *account_manager, const gchar *name)
+{
+    McdAccountManagerPrivate *priv = account_manager->priv;
+
+    return mcd_account_new (priv->dbus_daemon, priv->keyfile, name);
+}
+
 static void
 on_account_validity_changed (McdAccount *account, gboolean valid,
 			     McdAccountManager *account_manager)
@@ -186,7 +194,7 @@ complete_account_creation (McdAccountManager *account_manager,
     gboolean ok;
 
     account = MCD_ACCOUNT_MANAGER_GET_CLASS (account_manager)->account_new
-        (priv->dbus_daemon, priv->keyfile, unique_name);
+        (account_manager, unique_name);
 
     ok = mcd_account_set_parameters (account, params, error);
     if (ok)
@@ -462,7 +470,7 @@ _mcd_account_manager_setup (McdAccountManager *account_manager)
 	McdAccount *account;
 
         account = MCD_ACCOUNT_MANAGER_GET_CLASS (account_manager)->account_new
-            (priv->dbus_daemon, priv->keyfile, *name);
+            (account_manager, *name);
 	if (account)
 	    add_account (account_manager, account);
     }
@@ -573,7 +581,7 @@ mcd_account_manager_class_init (McdAccountManagerClass *klass)
     object_class->set_property = set_property;
     object_class->get_property = get_property;
 
-    klass->account_new = mcd_account_new;
+    klass->account_new = account_new;
 
     g_object_class_install_property
         (object_class, PROP_DBUS_DAEMON,
diff --git a/src/mcd-account-manager.h b/src/mcd-account-manager.h
index d4d2200..b6f4a5e 100644
--- a/src/mcd-account-manager.h
+++ b/src/mcd-account-manager.h
@@ -56,7 +56,7 @@ struct _McdAccountManager
 struct _McdAccountManagerClass
 {
     GObjectClass parent_class;
-    McdAccount *(*account_new) (TpDBusDaemon *dbus_daemon, GKeyFile *keyfile,
+    McdAccount *(*account_new) (McdAccountManager *account_manager,
                                 const gchar *name);
     void (*_mc_reserved2) (void);
     void (*_mc_reserved3) (void);
-- 
1.5.6.5