telepathy-mission-control: All account storage plugins: fill the vtable directly

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 48ca9d546d08df14cd4f79bc00627206c7a7efb6
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=48ca9d546d08df14cd4f79bc00627206c7a7efb6

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Sep 10 18:07:06 2012 +0100

All account storage plugins: fill the vtable directly

---

 src/mcd-account-manager-default.c     |   20 ++++++++++----------
 src/mcd-account-manager-sso.c         |   28 +++++++++++++---------------
 tests/twisted/mcp-account-diversion.c |   18 +++++++++---------
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
index ff48ac7..91a276f 100644
--- a/src/mcd-account-manager-default.c
+++ b/src/mcd-account-manager-default.c
@@ -761,16 +761,16 @@ static void
 account_storage_iface_init (McpAccountStorageIface *iface,
     gpointer unused G_GNUC_UNUSED)
 {
-  mcp_account_storage_iface_set_name (iface, PLUGIN_NAME);
-  mcp_account_storage_iface_set_desc (iface, PLUGIN_DESCRIPTION);
-  mcp_account_storage_iface_set_priority (iface, PLUGIN_PRIORITY);
-
-  mcp_account_storage_iface_implement_get (iface, _get);
-  mcp_account_storage_iface_implement_set (iface, _set);
-  mcp_account_storage_iface_implement_create (iface, _create);
-  mcp_account_storage_iface_implement_delete (iface, _delete);
-  mcp_account_storage_iface_implement_commit_one (iface, _commit);
-  mcp_account_storage_iface_implement_list (iface, _list);
+  iface->name = PLUGIN_NAME;
+  iface->desc = PLUGIN_DESCRIPTION;
+  iface->priority = PLUGIN_PRIORITY;
+
+  iface->get = _get;
+  iface->set = _set;
+  iface->create = _create;
+  iface->delete = _delete;
+  iface->commit_one = _commit;
+  iface->list = _list;
 
 }
 
diff --git a/src/mcd-account-manager-sso.c b/src/mcd-account-manager-sso.c
index 8e22ded..186c636 100644
--- a/src/mcd-account-manager-sso.c
+++ b/src/mcd-account-manager-sso.c
@@ -1723,21 +1723,19 @@ static void
 account_storage_iface_init (McpAccountStorageIface *iface,
     gpointer unused G_GNUC_UNUSED)
 {
-  mcp_account_storage_iface_set_name (iface, PLUGIN_NAME);
-  mcp_account_storage_iface_set_desc (iface, PLUGIN_DESCRIPTION);
-  mcp_account_storage_iface_set_priority (iface, PLUGIN_PRIORITY);
-  mcp_account_storage_iface_set_provider (iface, PLUGIN_PROVIDER);
-
-  mcp_account_storage_iface_implement_get (iface,
-      _mcd_account_manager_sso_get);
-  mcp_account_storage_iface_implement_set (iface, _set);
-  mcp_account_storage_iface_implement_delete (iface, _delete);
-  mcp_account_storage_iface_implement_commit (iface, _commit);
-  mcp_account_storage_iface_implement_list (iface, _list);
-  mcp_account_storage_iface_implement_ready (iface, _ready);
-  mcp_account_storage_iface_implement_get_identifier (iface, _get_identifier);
-  mcp_account_storage_iface_implement_get_additional_info (iface,
-      _get_additional_info);
+  iface->name = PLUGIN_NAME;
+  iface->desc = PLUGIN_DESCRIPTION;
+  iface->priority = PLUGIN_PRIORITY;
+  iface->provider = PLUGIN_PROVIDER;
+
+  iface->get = _mcd_account_manager_sso_get;
+  iface->set = _set;
+  iface->delete = _delete;
+  iface->commit = _commit;
+  iface->list = _list;
+  iface->ready = _ready;
+  iface->get_identifier = _get_identifier;
+  iface->get_additional_info = _get_additional_info;
 }
 
 McdAccountManagerSso *
diff --git a/tests/twisted/mcp-account-diversion.c b/tests/twisted/mcp-account-diversion.c
index 0994e25..a996764 100644
--- a/tests/twisted/mcp-account-diversion.c
+++ b/tests/twisted/mcp-account-diversion.c
@@ -258,15 +258,15 @@ static void
 account_storage_iface_init (McpAccountStorageIface *iface,
     gpointer unused G_GNUC_UNUSED)
 {
-  mcp_account_storage_iface_set_name (iface, PLUGIN_NAME);
-  mcp_account_storage_iface_set_desc (iface, PLUGIN_DESCRIPTION);
-  mcp_account_storage_iface_set_priority (iface, PLUGIN_PRIORITY);
-
-  mcp_account_storage_iface_implement_get (iface, _get);
-  mcp_account_storage_iface_implement_set (iface, _set);
-  mcp_account_storage_iface_implement_delete (iface, _delete);
-  mcp_account_storage_iface_implement_commit (iface, _commit);
-  mcp_account_storage_iface_implement_list (iface, _list);
+  iface->name = PLUGIN_NAME;
+  iface->desc = PLUGIN_DESCRIPTION;
+  iface->priority = PLUGIN_PRIORITY;
+
+  iface->get = _get;
+  iface->set = _set;
+  iface->delete = _delete;
+  iface->commit = _commit;
+  iface->list = _list;
 }