Revert "Remove mcp_account_storage_set()"

This reverts commit e9a9dd37bd193d8ac16729671d2296a4aa96139c.

2 files changed, 20 insertions, 41 deletions

diff --git a/tests/twisted/dbus-account-plugin.c b/tests/twisted/dbus-account-plugin.c
index b2ae25b2..9d79dc0a 100644
--- a/tests/twisted/dbus-account-plugin.c
+++ b/tests/twisted/dbus-account-plugin.c
@@ -1087,6 +1087,18 @@ test_dbus_account_plugin_get (const McpAccountStorage *storage,
 }
 
 static gboolean
+test_dbus_account_plugin_set (const McpAccountStorage *storage,
+    const McpAccountManager *am,
+    const gchar *account_name,
+    const gchar *key,
+    const gchar *value)
+{
+  /* Now that we implement set_attribute and set_parameter, this no longer
+   * needs a real implementation. */
+  return FALSE;
+}
+
+static gboolean
 test_dbus_account_plugin_set_attribute (McpAccountStorage *storage,
     McpAccountManager *am,
     const gchar *account_name,
@@ -1554,6 +1566,7 @@ account_storage_iface_init (McpAccountStorageIface *iface)
   iface->priority = MCP_ACCOUNT_STORAGE_PLUGIN_PRIO_NORMAL + 100;
 
   iface->get = test_dbus_account_plugin_get;
+  iface->set = test_dbus_account_plugin_set;
   iface->set_attribute = test_dbus_account_plugin_set_attribute;
   iface->set_parameter = test_dbus_account_plugin_set_parameter;
   iface->list = test_dbus_account_plugin_list;
diff --git a/tests/twisted/mcp-account-diversion.c b/tests/twisted/mcp-account-diversion.c
index 8707d069..c3fa55a0 100644
--- a/tests/twisted/mcp-account-diversion.c
+++ b/tests/twisted/mcp-account-diversion.c
@@ -112,57 +112,24 @@ _create_config (void)
 }
 
 static gboolean
-_set (McpAccountStorage *self,
-      McpAccountManager *am,
-      const gchar *account,
-      const gchar *key,
-      GVariant *val,
-      McpParameterFlags flags)
+_set (const McpAccountStorage *self,
+    const McpAccountManager *am,
+    const gchar *account,
+    const gchar *key,
+    const gchar *val)
 {
   AccountDiversionPlugin *adp = ACCOUNT_DIVERSION_PLUGIN (self);
-  gchar *val_str;
 
   if (g_str_has_prefix (account, DONT_DIVERT))
       return FALSE;
 
   adp->save = TRUE;
-
-  val_str = mcp_account_manager_escape_variant_for_keyfile (am, val);
-  g_key_file_set_value (adp->keyfile, account, key, val_str);
-  g_free (val_str);
+  g_key_file_set_value (adp->keyfile, account, key, val);
 
   return TRUE;
 }
 
 static gboolean
-_set_attribute (McpAccountStorage *self,
-      McpAccountManager *am,
-      const gchar *account,
-      const gchar *attribute,
-      GVariant *val,
-      McpAttributeFlags flags)
-{
-  return _set (self, am, account, attribute, val, flags);
-}
-
-static gboolean
-_set_parameter (McpAccountStorage *self,
-      McpAccountManager *am,
-      const gchar *account,
-      const gchar *parameter,
-      GVariant *val,
-      McpParameterFlags flags)
-{
-  gchar *param = g_strdup_printf ("param-%s", parameter);
-  gboolean ret;
-
-  ret = _set (self, am, account, param, val, flags);
-  g_free (param);
-
-  return ret;
-}
-
-static gboolean
 _get (const McpAccountStorage *self,
     const McpAccountManager *am,
     const gchar *account,
@@ -299,8 +266,7 @@ account_storage_iface_init (McpAccountStorageIface *iface,
   iface->priority = PLUGIN_PRIORITY;
 
   iface->get = _get;
-  iface->set_attribute = _set_attribute;
-  iface->set_parameter = _set_parameter;
+  iface->set = _set;
   iface->delete = _delete;
   iface->commit = _commit;
   iface->list = _list;