[telepathy-mission-control/master] mcd_account_get_keyfile: make internal

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Apr 8 08:29:57 PDT 2009


The fact that accounts are stored in a GKeyFile is an
implementation detail.
---
 src/mcd-account-compat.c        |   10 +++++-----
 src/mcd-account-conditions.c    |    6 +++---
 src/mcd-account-manager-query.c |    2 +-
 src/mcd-account.c               |    2 +-
 src/mcd-account.h               |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/mcd-account-compat.c b/src/mcd-account-compat.c
index bd4e8fc..09f1f3e 100644
--- a/src/mcd-account-compat.c
+++ b/src/mcd-account-compat.c
@@ -58,7 +58,7 @@ set_profile (TpSvcDBusProperties *self, const gchar *name,
     const gchar *string, *unique_name;
     GKeyFile *keyfile;
 
-    keyfile = mcd_account_get_keyfile (account);
+    keyfile = _mcd_account_get_keyfile (account);
     unique_name = mcd_account_get_unique_name (account);
     string = g_value_get_string (value);
     if (string && string[0] != 0)
@@ -82,7 +82,7 @@ get_profile (TpSvcDBusProperties *self, const gchar *name, GValue *value)
     GKeyFile *keyfile;
     gchar *string;
 
-    keyfile = mcd_account_get_keyfile (account);
+    keyfile = _mcd_account_get_keyfile (account);
     unique_name = mcd_account_get_unique_name (account);
     string = g_key_file_get_string (keyfile, unique_name,
 				    name, NULL);
@@ -109,7 +109,7 @@ set_secondary_vcard_fields (TpSvcDBusProperties *self, const gchar *name,
     const gchar *unique_name, **fields, **field;
     GKeyFile *keyfile;
 
-    keyfile = mcd_account_get_keyfile (account);
+    keyfile = _mcd_account_get_keyfile (account);
     unique_name = mcd_account_get_unique_name (account);
     fields = g_value_get_boxed (value);
     if (fields)
@@ -137,7 +137,7 @@ get_secondary_vcard_fields (TpSvcDBusProperties *self, const gchar *name,
     const gchar *unique_name;
     gchar **fields;
 
-    keyfile = mcd_account_get_keyfile (account);
+    keyfile = _mcd_account_get_keyfile (account);
     unique_name = mcd_account_get_unique_name (account);
     fields = g_key_file_get_string_list (keyfile, unique_name,
 					 name, NULL, NULL);
@@ -174,7 +174,7 @@ mcd_account_compat_get_mc_profile (McdAccount *account)
     gchar *profile_name;
     McProfile *profile = NULL;
 
-    keyfile = mcd_account_get_keyfile (account);
+    keyfile = _mcd_account_get_keyfile (account);
     unique_name = mcd_account_get_unique_name (account);
     profile_name = g_key_file_get_string (keyfile, unique_name,
                                           "Profile", NULL);
diff --git a/src/mcd-account-conditions.c b/src/mcd-account-conditions.c
index bb6705a..b5f7866 100644
--- a/src/mcd-account-conditions.c
+++ b/src/mcd-account-conditions.c
@@ -48,7 +48,7 @@ store_condition (gpointer key, gpointer value, gpointer userdata)
     gchar condition_key[256];
     GKeyFile *keyfile;
 
-    keyfile = mcd_account_get_keyfile (account);
+    keyfile = _mcd_account_get_keyfile (account);
     unique_name = mcd_account_get_unique_name (account);
     g_snprintf (condition_key, sizeof (condition_key), "condition-%s", name);
     g_key_file_set_string (keyfile, unique_name, condition_key, condition);
@@ -64,7 +64,7 @@ set_condition (TpSvcDBusProperties *self, const gchar *name,
     gchar **keys, **key;
     GHashTable *conditions;
 
-    keyfile = mcd_account_get_keyfile (account);
+    keyfile = _mcd_account_get_keyfile (account);
     unique_name = mcd_account_get_unique_name (account);
     conditions = g_value_get_boxed (value);
     /* first, delete existing conditions */
@@ -112,7 +112,7 @@ GHashTable *mcd_account_get_conditions (McdAccount *account)
     gchar **keys, **key, *condition;
     GHashTable *conditions;
 
-    keyfile = mcd_account_get_keyfile (account);
+    keyfile = _mcd_account_get_keyfile (account);
     unique_name = mcd_account_get_unique_name (account);
     conditions = g_hash_table_new_full (g_str_hash, g_str_equal,
 					g_free, g_free);
diff --git a/src/mcd-account-manager-query.c b/src/mcd-account-manager-query.c
index 51382b1..17db277 100644
--- a/src/mcd-account-manager-query.c
+++ b/src/mcd-account-manager-query.c
@@ -96,7 +96,7 @@ match_account_parameter (McdAccount *account, const gchar *name,
     gboolean match = FALSE;
 
     unique_name = mcd_account_get_unique_name (account);
-    keyfile = mcd_account_get_keyfile (account);
+    keyfile = _mcd_account_get_keyfile (account);
     if (g_key_file_has_key (keyfile, unique_name, name, NULL))
     {
 	const gchar *value_str;
diff --git a/src/mcd-account.c b/src/mcd-account.c
index f7403c4..a9d25f2 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -2338,7 +2338,7 @@ _mcd_account_online_request (McdAccount *account,
 }
 
 GKeyFile *
-mcd_account_get_keyfile (McdAccount *account)
+_mcd_account_get_keyfile (McdAccount *account)
 {
     McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (account);
     return priv->keyfile;
diff --git a/src/mcd-account.h b/src/mcd-account.h
index c1e3805..5c23b1d 100644
--- a/src/mcd-account.h
+++ b/src/mcd-account.h
@@ -84,7 +84,7 @@ gboolean mcd_account_delete (McdAccount *account, GError **error);
 const gchar *mcd_account_get_unique_name (McdAccount *account);
 const gchar *mcd_account_get_object_path (McdAccount *account);
 
-GKeyFile *mcd_account_get_keyfile (McdAccount *account);
+G_GNUC_INTERNAL GKeyFile *_mcd_account_get_keyfile (McdAccount *account);
 
 gboolean mcd_account_is_valid (McdAccount *account);
 gboolean mcd_account_check_validity (McdAccount *account);
-- 
1.5.6.5




More information about the telepathy-commits mailing list