[Telepathy-commits] [telepathy-mission-control/master] Align to latest API from McdAccountManager

[Alberto Mardegan]

---
 src/mcd-account-compat.c     |   15 +++++++++++++--
 src/mcd-account-conditions.c |   13 ++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/mcd-account-compat.c b/src/mcd-account-compat.c
index 764f989..5900f8b 100644
--- a/src/mcd-account-compat.c
+++ b/src/mcd-account-compat.c
@@ -52,6 +52,17 @@ typedef struct
     gchar *requestor_client_id;
 } McdAccountCompatReq;
 
+static inline void
+mcd_account_write_conf (McdAccount *account)
+{
+    McdAccountManager *account_manager;
+
+    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);
+}
+
 static void
 set_profile (TpSvcDBusProperties *self, const gchar *name,
 	     const GValue *value)
@@ -71,7 +82,7 @@ set_profile (TpSvcDBusProperties *self, const gchar *name,
 	g_key_file_remove_key (keyfile, unique_name,
 			       name, NULL);
     }
-    mcd_account_manager_write_conf (keyfile);
+    mcd_account_write_conf (account);
 }
 
 static void
@@ -125,7 +136,7 @@ set_secondary_vcard_fields (TpSvcDBusProperties *self, const gchar *name,
 	g_key_file_remove_key (keyfile, unique_name,
 			       name, NULL);
     }
-    mcd_account_manager_write_conf (keyfile);
+    mcd_account_write_conf (account);
 }
 
 static void
diff --git a/src/mcd-account-conditions.c b/src/mcd-account-conditions.c
index e6a93b1..f0e0a1a 100644
--- a/src/mcd-account-conditions.c
+++ b/src/mcd-account-conditions.c
@@ -39,6 +39,17 @@
 #include "_gen/interfaces.h"
 
 
+static inline void
+mcd_account_write_conf (McdAccount *account)
+{
+    McdAccountManager *account_manager;
+
+    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);
+}
+
 static void
 store_condition (gpointer key, gpointer value, gpointer userdata)
 {
@@ -79,7 +90,7 @@ set_condition (TpSvcDBusProperties *self, const gchar *name,
 
     g_hash_table_foreach (conditions, store_condition, account);
 
-    mcd_account_manager_write_conf (keyfile);
+    mcd_account_write_conf (account);
 }
 
 static void
-- 
1.5.6.5