[telepathy-mission-control/master] mcd-account{, -manager}: first port of using write_conf to write_conf_async

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 src/mcd-account-manager.c |    2 +-
 src/mcd-account-priv.h    |    2 +-
 src/mcd-account.c         |   21 +++++++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 7d5e6b0..99d828c 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -452,7 +452,7 @@ complete_account_creation (McdAccount *account,
         account = NULL;
     }
 
-    mcd_account_manager_write_conf (account_manager);
+    mcd_account_manager_write_conf_async (account_manager, NULL, NULL);
 
     cad->callback (account_manager, account, error, cad->user_data);
     if (G_UNLIKELY (error))
diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h
index 3374046..af4d130 100644
--- a/src/mcd-account-priv.h
+++ b/src/mcd-account-priv.h
@@ -111,7 +111,7 @@ _mcd_account_write_conf (McdAccount *account)
     account_manager = mcd_account_get_account_manager (account);
     g_return_if_fail (MCD_IS_ACCOUNT_MANAGER (account_manager));
 
-    mcd_account_manager_write_conf (account_manager);
+    mcd_account_manager_write_conf_async (account_manager, NULL, NULL);
 }
 
 G_GNUC_INTERNAL void _mcd_account_compat_class_init (McdAccountClass *klass);
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 8dac309..13dea8f 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -635,7 +635,7 @@ _mcd_account_delete (McdAccount *account, GError **error)
         g_rmdir (data_dir_str);
     }
     g_free (data_dir_str);
-    mcd_account_manager_write_conf (priv->account_manager);
+    mcd_account_manager_write_conf_async (priv->account_manager, NULL, NULL);
     return TRUE;
 }
 
@@ -863,7 +863,7 @@ mcd_account_set_string_val (McdAccount *account, const gchar *key,
 			       key, NULL);
 	string = NULL;
     }
-    mcd_account_manager_write_conf (priv->account_manager);
+    mcd_account_manager_write_conf_async (priv->account_manager, NULL, NULL);
     mcd_account_changed_property (account, key, value);
     return SET_RESULT_CHANGED;
 }
@@ -973,7 +973,7 @@ set_enabled (TpSvcDBusProperties *self, const gchar *name, const GValue *value,
 				MC_ACCOUNTS_KEY_ENABLED,
 			       	enabled);
 	priv->enabled = enabled;
-	mcd_account_manager_write_conf (priv->account_manager);
+        mcd_account_manager_write_conf_async (priv->account_manager, NULL, NULL);
 	mcd_account_changed_property (account, name, value);
 
         if (enabled)
@@ -1197,7 +1197,7 @@ set_automatic_presence (TpSvcDBusProperties *self,
 
     if (changed)
     {
-	mcd_account_manager_write_conf (priv->account_manager);
+      mcd_account_manager_write_conf_async (priv->account_manager, NULL, NULL);
 	mcd_account_changed_property (account, name, value);
     }
 
@@ -1254,7 +1254,7 @@ set_connect_automatically (TpSvcDBusProperties *self,
 				MC_ACCOUNTS_KEY_CONNECT_AUTOMATICALLY,
 			       	connect_automatically);
 	priv->connect_automatically = connect_automatically;
-	mcd_account_manager_write_conf (priv->account_manager);
+        mcd_account_manager_write_conf_async (priv->account_manager, NULL, NULL);
 	mcd_account_changed_property (account, name, value);
 
         if (connect_automatically)
@@ -1790,7 +1790,7 @@ account_update_parameters (TpSvcAccount *self, GHashTable *set,
     mcd_account_changed_property (account, "Parameters", &value);
     g_value_unset (&value);
 
-    mcd_account_manager_write_conf (priv->account_manager);
+    mcd_account_manager_write_conf_async (priv->account_manager, NULL, NULL);
 
     g_ptr_array_add (not_yet, NULL);
 
@@ -2481,7 +2481,7 @@ _mcd_account_set_normalized_name (McdAccount *account, const gchar *name)
     else
 	g_key_file_remove_key (priv->keyfile, priv->unique_name,
 			       MC_ACCOUNTS_KEY_NORMALIZED_NAME, NULL);
-    mcd_account_manager_write_conf (priv->account_manager);
+    mcd_account_manager_write_conf_async (priv->account_manager, NULL, NULL);
 
     g_value_init (&value, G_TYPE_STRING);
     g_value_set_static_string (&value, name);
@@ -2510,7 +2510,7 @@ _mcd_account_set_avatar_token (McdAccount *account, const gchar *token)
     else
 	g_key_file_remove_key (priv->keyfile, priv->unique_name,
 			       MC_ACCOUNTS_KEY_AVATAR_TOKEN, NULL);
-    mcd_account_manager_write_conf (priv->account_manager);
+    mcd_account_manager_write_conf_async (priv->account_manager, NULL, NULL);
 }
 
 gchar *
@@ -2580,7 +2580,7 @@ _mcd_account_set_avatar (McdAccount *account, const GArray *avatar,
         }
     }
 
-    mcd_account_manager_write_conf (priv->account_manager);
+    mcd_account_manager_write_conf_async (priv->account_manager, NULL, NULL);
     return TRUE;
 }
 
@@ -3062,7 +3062,8 @@ _mcd_account_set_has_been_online (McdAccount *account)
                                 account->priv->unique_name,
                                 MC_ACCOUNTS_KEY_HAS_BEEN_ONLINE, TRUE);
         account->priv->has_been_online = TRUE;
-        mcd_account_manager_write_conf (account->priv->account_manager);
+        mcd_account_manager_write_conf_async (account->priv->account_manager,
+                                              NULL, NULL);
 
         g_value_init (&value, G_TYPE_BOOLEAN);
         g_value_set_boolean (&value, TRUE);
-- 
1.5.6.5