[telepathy-mission-control/master] McdAccount: internalize mcd_account_get_avatar*

[Simon McVittie]

---
 src/mcd-account-compat.c |    2 +-
 src/mcd-account.c        |   14 +++++++-------
 src/mcd-account.h        |    9 +++++----
 src/mcd-connection.c     |   10 +++++-----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/mcd-account-compat.c b/src/mcd-account-compat.c
index 09f1f3e..b900f26 100644
--- a/src/mcd-account-compat.c
+++ b/src/mcd-account-compat.c
@@ -96,7 +96,7 @@ get_avatar_file (TpSvcDBusProperties *self, const gchar *name, GValue *value)
     McdAccount *account = MCD_ACCOUNT (self);
     gchar *string;
 
-    string = mcd_account_get_avatar_filename (account);
+    string = _mcd_account_get_avatar_filename (account);
     g_value_init (value, G_TYPE_STRING);
     g_value_take_string (value, string);
 }
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 7828908..14dfb1f 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -757,7 +757,7 @@ get_avatar (TpSvcDBusProperties *self, const gchar *name, GValue *value)
     GType type;
     GValueArray *va;
 
-    mcd_account_get_avatar (account, &avatar, &mime_type);
+    _mcd_account_get_avatar (account, &avatar, &mime_type);
     if (!avatar)
         avatar = g_array_new (FALSE, FALSE, 1);
 
@@ -2001,7 +2001,7 @@ _mcd_account_set_avatar_token (McdAccount *account, const gchar *token)
 }
 
 gchar *
-mcd_account_get_avatar_token (McdAccount *account)
+_mcd_account_get_avatar_token (McdAccount *account)
 {
     McdAccountPrivate *priv = account->priv;
 
@@ -2049,7 +2049,7 @@ _mcd_account_set_avatar (McdAccount *account, const GArray *avatar,
     {
         gchar *prev_token;
 
-        prev_token = mcd_account_get_avatar_token (account);
+        prev_token = _mcd_account_get_avatar_token (account);
         g_key_file_set_string (priv->keyfile, priv->unique_name,
                                MC_ACCOUNTS_KEY_AVATAR_TOKEN, token);
         if (!prev_token || strcmp (prev_token, token) != 0)
@@ -2069,8 +2069,8 @@ _mcd_account_set_avatar (McdAccount *account, const GArray *avatar,
 }
 
 void
-mcd_account_get_avatar (McdAccount *account, GArray **avatar,
-		       	gchar **mime_type)
+_mcd_account_get_avatar (McdAccount *account, GArray **avatar,
+                         gchar **mime_type)
 {
     McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (account);
     gchar *filename;
@@ -2079,7 +2079,7 @@ mcd_account_get_avatar (McdAccount *account, GArray **avatar,
 					MC_ACCOUNTS_KEY_AVATAR_MIME, NULL);
 
     if (avatar) *avatar = NULL;
-    filename = mcd_account_get_avatar_filename (account);
+    filename = _mcd_account_get_avatar_filename (account);
 
     if (filename && g_file_test (filename, G_FILE_TEST_EXISTS))
     {
@@ -2346,7 +2346,7 @@ _mcd_account_get_keyfile (McdAccount *account)
 
 /* this is public because of mcd-account-compat */
 gchar *
-mcd_account_get_avatar_filename (McdAccount *account)
+_mcd_account_get_avatar_filename (McdAccount *account)
 {
     McdAccountPrivate *priv = account->priv;
     gchar *data_dir, *filename;
diff --git a/src/mcd-account.h b/src/mcd-account.h
index 3a4e00f..9f261c8 100644
--- a/src/mcd-account.h
+++ b/src/mcd-account.h
@@ -135,11 +135,12 @@ G_GNUC_INTERNAL gboolean _mcd_account_set_avatar (McdAccount *account,
                                                   const gchar *mime_type,
                                                   const gchar *token,
                                                   GError **error);
-void mcd_account_get_avatar (McdAccount *account, GArray **avatar,
-			     gchar **mime_type);
+G_GNUC_INTERNAL void _mcd_account_get_avatar (McdAccount *account,
+                                              GArray **avatar,
+                                              gchar **mime_type);
 G_GNUC_INTERNAL void _mcd_account_set_avatar_token (McdAccount *account,
                                                     const gchar *token);
-gchar *mcd_account_get_avatar_token (McdAccount *account);
+G_GNUC_INTERNAL gchar *_mcd_account_get_avatar_token (McdAccount *account);
 
 G_GNUC_INTERNAL void _mcd_account_set_alias (McdAccount *account,
                                              const gchar *alias);
@@ -153,7 +154,7 @@ TpConnectionStatusReason mcd_account_get_connection_status_reason (McdAccount *a
 
 McdConnection *mcd_account_get_connection (McdAccount *account);
 
-gchar *mcd_account_get_avatar_filename (McdAccount *account);
+G_GNUC_INTERNAL gchar *_mcd_account_get_avatar_filename (McdAccount *account);
 
 /* non-exported methods */
 void _mcd_account_tp_connection_changed (McdAccount *account);
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index c63c713..10913d0 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -793,7 +793,7 @@ on_avatar_retrieved (TpConnection *proxy, guint contact_id, const gchar *token,
     if (priv->setting_avatar) return;
 
     DEBUG ("Avatar retrieved for contact %d, token: %s", contact_id, token);
-    prev_token = mcd_account_get_avatar_token (priv->account);
+    prev_token = _mcd_account_get_avatar_token (priv->account);
 
     if (!prev_token || strcmp (token, prev_token) != 0)
     {
@@ -828,7 +828,7 @@ on_avatar_updated (TpConnection *proxy, guint contact_id, const gchar *token,
     if (priv->setting_avatar) return;
 
     DEBUG ("contact %d, token: %s", contact_id, token);
-    prev_token = mcd_account_get_avatar_token (priv->account);
+    prev_token = _mcd_account_get_avatar_token (priv->account);
 
     if (!prev_token || strcmp (token, prev_token) != 0)
     {
@@ -893,7 +893,7 @@ avatars_request_tokens_cb (TpConnection *proxy, GHashTable *tokens,
     if (token)
 	return;
 
-    mcd_account_get_avatar (priv->account, &avatar, &mime_type);
+    _mcd_account_get_avatar (priv->account, &avatar, &mime_type);
     if (avatar)
     {
         DEBUG ("No avatar set, setting our own");
@@ -935,11 +935,11 @@ _mcd_connection_setup_avatar (McdConnection *connection)
 								     NULL);
     priv->setting_avatar = FALSE;
 
-    mcd_account_get_avatar (priv->account, &avatar, &mime_type);
+    _mcd_account_get_avatar (priv->account, &avatar, &mime_type);
 
     if (avatar)
     {
-	token = mcd_account_get_avatar_token (priv->account);
+	token = _mcd_account_get_avatar_token (priv->account);
 	g_free (token);
 	if (!token)
 	    _mcd_connection_set_avatar (connection, avatar, mime_type);
-- 
1.5.6.5