[telepathy-mission-control/master] McdAccount: make _mcd_account_connection_begin internal
Simon McVittie
simon.mcvittie at collabora.co.uk
Tue Apr 14 10:16:01 PDT 2009
Also make _mcd_account_connection_class_init internal, rather than trying
to make it inline (in a way that doesn't work).
---
src/mcd-account-connection.c | 2 +-
src/mcd-account-connection.h | 4 ++--
src/mcd-account.c | 6 +++---
src/mcd-connection.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/mcd-account-connection.c b/src/mcd-account-connection.c
index b7213ed..b4f23ff 100644
--- a/src/mcd-account-connection.c
+++ b/src/mcd-account-connection.c
@@ -51,7 +51,7 @@ context_free (gpointer ptr)
}
void
-mcd_account_connection_begin (McdAccount *account)
+_mcd_account_connection_begin (McdAccount *account)
{
McdAccountConnectionContext *ctx;
diff --git a/src/mcd-account-connection.h b/src/mcd-account-connection.h
index 4834440..08d75ce 100644
--- a/src/mcd-account-connection.h
+++ b/src/mcd-account-connection.h
@@ -33,8 +33,8 @@
G_BEGIN_DECLS
-void mcd_account_connection_begin (McdAccount *account);
-inline void _mcd_account_connection_class_init (McdAccountClass *klass);
+G_GNUC_INTERNAL void _mcd_account_connection_begin (McdAccount *account);
+G_GNUC_INTERNAL void _mcd_account_connection_class_init (McdAccountClass *klass);
G_END_DECLS
diff --git a/src/mcd-account.c b/src/mcd-account.c
index e3a87d0..94f366c 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -464,7 +464,7 @@ mcd_account_request_presence_int (McdAccount *account,
if (type >= TP_CONNECTION_PRESENCE_TYPE_AVAILABLE && !priv->connection)
{
- mcd_account_connection_begin (account);
+ _mcd_account_connection_begin (account);
}
g_signal_emit (account,
@@ -1276,7 +1276,7 @@ _mcd_account_set_parameters (McdAccount *account, GHashTable *params,
{
DEBUG ("resetting connection");
mcd_connection_close (priv->connection);
- mcd_account_connection_begin (account);
+ _mcd_account_connection_begin (account);
}
else
{
@@ -2324,7 +2324,7 @@ _mcd_account_request_connection (McdAccount *account)
McdAccountPrivate *priv = account->priv;
if (!priv->connection)
- mcd_account_connection_begin (account);
+ _mcd_account_connection_begin (account);
if (priv->auto_presence_type >= TP_CONNECTION_PRESENCE_TYPE_AVAILABLE)
mcd_account_request_presence_int (account,
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 1dd0b41..2559940 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -2455,7 +2455,7 @@ mcd_connection_connect (McdConnection *connection, GHashTable *params)
if (params)
_mcd_connection_connect_with_params (connection, params);
else
- mcd_account_connection_begin (priv->account);
+ _mcd_account_connection_begin (priv->account);
}
else
{
--
1.5.6.5
More information about the telepathy-commits
mailing list