[telepathy-mission-control/master] McdAccount: make all setter functions internal
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Apr 8 08:42:49 PDT 2009
Subclasses of McdConnection etc. shouldn't be manipulating
internal state like that.
---
src/mcd-account-manager.c | 2 +-
src/mcd-account.c | 46 +++++++++++++-------------
src/mcd-account.h | 44 +++++++++++++-----------
src/mcd-connection.c | 81 ++++++++++++++++++++++++---------------------
4 files changed, 91 insertions(+), 82 deletions(-)
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index ddfc6d5..1796282 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -329,7 +329,7 @@ complete_account_creation (McdAccount *account,
return;
}
- ok = mcd_account_set_parameters (account, cad->parameters, &error);
+ ok = _mcd_account_set_parameters (account, cad->parameters, &error);
if (ok)
{
add_account (account_manager, account);
diff --git a/src/mcd-account.c b/src/mcd-account.c
index a9d25f2..7828908 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -736,7 +736,7 @@ set_avatar (TpSvcDBusProperties *self, const gchar *name, const GValue *value)
va = g_value_get_boxed (value);
avatar = g_value_get_boxed (va->values);
mime_type = g_value_get_string (va->values + 1);
- changed = mcd_account_set_avatar (account, avatar, mime_type, NULL,
+ changed = _mcd_account_set_avatar (account, avatar, mime_type, NULL,
&error);
if (error)
{
@@ -1149,8 +1149,8 @@ mcd_account_check_parameters (McdAccount *account)
return valid;
}
-/**
- * mcd_account_set_parameter:
+/*
+ * _mcd_account_set_parameter:
* @account: the #McdAccount.
* @name: the parameter name.
* @value: a #GValue with the value to set, or %NULL.
@@ -1159,15 +1159,15 @@ mcd_account_check_parameters (McdAccount *account)
* parameter is unset.
*/
void
-mcd_account_set_parameter (McdAccount *account, const gchar *name,
- const GValue *value)
+_mcd_account_set_parameter (McdAccount *account, const gchar *name,
+ const GValue *value)
{
MCD_ACCOUNT_GET_CLASS (account)->set_parameter (account, name, value);
}
gboolean
-mcd_account_set_parameters (McdAccount *account, GHashTable *params,
- GError **error)
+_mcd_account_set_parameters (McdAccount *account, GHashTable *params,
+ GError **error)
{
McdAccountPrivate *priv = account->priv;
const TpConnectionManagerParam *param;
@@ -1251,7 +1251,7 @@ mcd_account_set_parameters (McdAccount *account, GHashTable *params,
g_hash_table_iter_init (&iter, params);
while (g_hash_table_iter_next (&iter, (gpointer)&name, (gpointer)&value))
{
- mcd_account_set_parameter (account, name, value);
+ _mcd_account_set_parameter (account, name, value);
}
if (mcd_account_get_connection_status (account) ==
@@ -1289,7 +1289,7 @@ mcd_account_unset_parameters (McdAccount *account, const gchar **params)
for (param = params; *param != NULL; param++)
{
- mcd_account_set_parameter (account, *param, NULL);
+ _mcd_account_set_parameter (account, *param, NULL);
}
}
@@ -1305,7 +1305,7 @@ account_update_parameters (McSvcAccount *self, GHashTable *set,
DEBUG ("called for %s", priv->unique_name);
- if (!mcd_account_set_parameters (account, set, &error))
+ if (!_mcd_account_set_parameters (account, set, &error))
{
if (!error)
g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
@@ -1832,8 +1832,8 @@ mcd_account_request_presence (McdAccount *account,
}
}
-/**
- * mcd_account_set_current_presence:
+/*
+ * _mcd_account_set_current_presence:
* @account: the #McdAccount.
* @presence: a #TpConnectionPresenceType.
* @status: presence status.
@@ -1842,9 +1842,9 @@ mcd_account_request_presence (McdAccount *account,
* Set a presence status on the account.
*/
void
-mcd_account_set_current_presence (McdAccount *account,
- TpConnectionPresenceType presence,
- const gchar *status, const gchar *message)
+_mcd_account_set_current_presence (McdAccount *account,
+ TpConnectionPresenceType presence,
+ const gchar *status, const gchar *message)
{
McdAccountPrivate *priv = account->priv;
gboolean changed = FALSE;
@@ -1956,7 +1956,7 @@ mcd_account_get_protocol_name (McdAccount *account)
}
void
-mcd_account_set_normalized_name (McdAccount *account, const gchar *name)
+_mcd_account_set_normalized_name (McdAccount *account, const gchar *name)
{
McdAccountPrivate *priv = account->priv;
GValue value = { 0, };
@@ -1986,7 +1986,7 @@ mcd_account_get_normalized_name (McdAccount *account)
}
void
-mcd_account_set_avatar_token (McdAccount *account, const gchar *token)
+_mcd_account_set_avatar_token (McdAccount *account, const gchar *token)
{
McdAccountPrivate *priv = account->priv;
@@ -2010,7 +2010,7 @@ mcd_account_get_avatar_token (McdAccount *account)
}
gboolean
-mcd_account_set_avatar (McdAccount *account, const GArray *avatar,
+_mcd_account_set_avatar (McdAccount *account, const GArray *avatar,
const gchar *mime_type, const gchar *token,
GError **error)
{
@@ -2105,7 +2105,7 @@ mcd_account_get_avatar (McdAccount *account, GArray **avatar,
}
void
-mcd_account_set_alias (McdAccount *account, const gchar *alias)
+_mcd_account_set_alias (McdAccount *account, const gchar *alias)
{
GValue value = { 0 };
@@ -2178,9 +2178,9 @@ process_online_requests (McdAccount *account,
}
void
-mcd_account_set_connection_status (McdAccount *account,
- TpConnectionStatus status,
- TpConnectionStatusReason reason)
+_mcd_account_set_connection_status (McdAccount *account,
+ TpConnectionStatus status,
+ TpConnectionStatusReason reason)
{
McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (account);
gboolean changed = FALSE;
@@ -2329,7 +2329,7 @@ _mcd_account_online_request (McdAccount *account,
/* now the connection should be in connecting state; insert the
* callback in the online_requests hash table, which will be processed
- * in the mcd_account_set_connection_status function */
+ * in the _mcd_account_set_connection_status function */
data = g_slice_new (McdOnlineRequestData);
data->callback = callback;
data->user_data = userdata;
diff --git a/src/mcd-account.h b/src/mcd-account.h
index 5c23b1d..3a4e00f 100644
--- a/src/mcd-account.h
+++ b/src/mcd-account.h
@@ -94,22 +94,23 @@ gboolean mcd_account_is_enabled (McdAccount *account);
const gchar *mcd_account_get_manager_name (McdAccount *account);
const gchar *mcd_account_get_protocol_name (McdAccount *account);
-gboolean mcd_account_set_parameters (McdAccount *account, GHashTable *params,
- GError **error);
+G_GNUC_INTERNAL gboolean _mcd_account_set_parameters (McdAccount *account,
+ GHashTable *params,
+ GError **error);
GHashTable *mcd_account_get_parameters (McdAccount *account);
gboolean mcd_account_check_parameters (McdAccount *account);
-void mcd_account_set_parameter (McdAccount *account, const gchar *name,
- const GValue *value);
+G_GNUC_INTERNAL void _mcd_account_set_parameter (McdAccount *account,
+ const gchar *name,
+ const GValue *value);
gboolean mcd_account_get_parameter (McdAccount *account, const gchar *name,
GValue *value);
void mcd_account_request_presence (McdAccount *account,
TpConnectionPresenceType type,
const gchar *status, const gchar *message);
-void mcd_account_set_current_presence (McdAccount *account,
- TpConnectionPresenceType presence,
- const gchar *status,
- const gchar *message);
+G_GNUC_INTERNAL void _mcd_account_set_current_presence (McdAccount *account,
+ TpConnectionPresenceType presence, const gchar *status,
+ const gchar *message);
void mcd_account_get_current_presence (McdAccount *account,
TpConnectionPresenceType *presence,
const gchar **status,
@@ -125,24 +126,28 @@ void mcd_account_get_automatic_presence (McdAccount *account,
const gchar **status,
const gchar **message);
-void mcd_account_set_normalized_name (McdAccount *account, const gchar *name);
+G_GNUC_INTERNAL void _mcd_account_set_normalized_name (McdAccount *account,
+ const gchar *name);
gchar *mcd_account_get_normalized_name (McdAccount *account);
-gboolean mcd_account_set_avatar (McdAccount *account, const GArray *avatar,
- const gchar *mime_type, const gchar *token,
- GError **error);
+G_GNUC_INTERNAL gboolean _mcd_account_set_avatar (McdAccount *account,
+ const GArray *avatar,
+ const gchar *mime_type,
+ const gchar *token,
+ GError **error);
void mcd_account_get_avatar (McdAccount *account, GArray **avatar,
gchar **mime_type);
-void mcd_account_set_avatar_token (McdAccount *account, const gchar *token);
+G_GNUC_INTERNAL void _mcd_account_set_avatar_token (McdAccount *account,
+ const gchar *token);
gchar *mcd_account_get_avatar_token (McdAccount *account);
-void mcd_account_set_alias (McdAccount *account, const gchar *alias);
+G_GNUC_INTERNAL void _mcd_account_set_alias (McdAccount *account,
+ const gchar *alias);
gchar *mcd_account_get_alias (McdAccount *account);
-void mcd_account_set_connection_status (McdAccount *account,
- TpConnectionStatus status,
- TpConnectionStatusReason reason);
+G_GNUC_INTERNAL void _mcd_account_set_connection_status (McdAccount *account,
+ TpConnectionStatus status, TpConnectionStatusReason reason);
TpConnectionStatus mcd_account_get_connection_status (McdAccount *account);
TpConnectionStatusReason mcd_account_get_connection_status_reason (McdAccount *account);
@@ -156,8 +161,7 @@ void _mcd_account_tp_connection_changed (McdAccount *account);
G_GNUC_INTERNAL
void _mcd_account_load (McdAccount *account, McdAccountLoadCb callback,
gpointer user_data);
-G_GNUC_INTERNAL
-void _mcd_account_set_connection (McdAccount *account,
- McdConnection *connection);
+G_GNUC_INTERNAL void _mcd_account_set_connection (McdAccount *account,
+ McdConnection *connection);
#endif
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 762df6c..c63c713 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -236,8 +236,8 @@ presence_set_status_cb (TpConnection *proxy, const GError *error,
* been changed -- but we hope it didn't */
mcd_account_get_requested_presence (priv->account,
&presence, &status, &message);
- mcd_account_set_current_presence (priv->account,
- presence, status, message);
+ _mcd_account_set_current_presence (priv->account,
+ presence, status, message);
}
}
@@ -376,8 +376,8 @@ on_presences_changed (TpConnection *proxy, GHashTable *presences,
presence = g_value_get_uint (va->values);
status = g_value_get_string (va->values + 1);
message = g_value_get_string (va->values + 2);
- mcd_account_set_current_presence (priv->account,
- presence, status, message);
+ _mcd_account_set_current_presence (priv->account,
+ presence, status, message);
priv->got_presences_changed = TRUE;
}
}
@@ -724,7 +724,7 @@ inspect_handles_cb (TpConnection *proxy, const gchar **names,
}
if (names && names[0] != NULL)
{
- mcd_account_set_normalized_name (priv->account, names[0]);
+ _mcd_account_set_normalized_name (priv->account, names[0]);
}
}
@@ -762,7 +762,7 @@ avatars_set_avatar_cb (TpConnection *proxy, const gchar *token,
return;
}
DEBUG ("received token: %s", token);
- mcd_account_set_avatar_token (priv->account, token);
+ _mcd_account_set_avatar_token (priv->account, token);
}
static void
@@ -798,7 +798,8 @@ on_avatar_retrieved (TpConnection *proxy, guint contact_id, const gchar *token,
if (!prev_token || strcmp (token, prev_token) != 0)
{
DEBUG ("received mime-type: %s", mime_type);
- mcd_account_set_avatar (priv->account, avatar, mime_type, token, NULL);
+ _mcd_account_set_avatar (priv->account, avatar, mime_type, token,
+ NULL);
}
g_free (prev_token);
}
@@ -989,9 +990,9 @@ on_aliases_changed (TpConnection *proxy, const GPtrArray *aliases,
DEBUG ("This is our alias");
if (!priv->alias || strcmp (priv->alias, alias) != 0)
{
- g_free (priv->alias);
- priv->alias = alias;
- mcd_account_set_alias (priv->account, alias);
+ g_free (priv->alias);
+ priv->alias = alias;
+ _mcd_account_set_alias (priv->account, alias);
}
break;
}
@@ -1083,17 +1084,19 @@ on_connection_status_changed (TpConnection *tp_conn, GParamSpec *pspec,
switch (conn_status)
{
case TP_CONNECTION_STATUS_CONNECTING:
- mcd_account_set_connection_status (priv->account,
- conn_status, conn_reason);
- priv->abort_reason = TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED;
- break;
+ _mcd_account_set_connection_status (priv->account,
+ conn_status, conn_reason);
+ priv->abort_reason = TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED;
+ break;
+
case TP_CONNECTION_STATUS_CONNECTED:
- {
- mcd_account_set_connection_status (priv->account,
- conn_status, conn_reason);
- priv->reconnect_interval = INITIAL_RECONNECTION_TIME;
- }
- break;
+ {
+ _mcd_account_set_connection_status (priv->account,
+ conn_status, conn_reason);
+ priv->reconnect_interval = INITIAL_RECONNECTION_TIME;
+ }
+ break;
+
case TP_CONNECTION_STATUS_DISCONNECTED:
/* Connection could die during account status updated if its
* manager is the only one holding the reference to it (manager will
@@ -1111,6 +1114,7 @@ on_connection_status_changed (TpConnection *tp_conn, GParamSpec *pspec,
NULL, NULL);
}
break;
+
default:
g_warning ("Unknown telepathy connection status");
}
@@ -1549,12 +1553,13 @@ request_connection_cb (TpConnectionManager *proxy, const gchar *bus_name,
if (tperror)
{
- g_warning ("%s: RequestConnection failed: %s",
- G_STRFUNC, tperror->message);
- mcd_account_set_connection_status (priv->account,
- TP_CONNECTION_STATUS_DISCONNECTED,
- TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
- return;
+ g_warning ("%s: RequestConnection failed: %s",
+ G_STRFUNC, tperror->message);
+
+ _mcd_account_set_connection_status (priv->account,
+ TP_CONNECTION_STATUS_DISCONNECTED,
+ TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
+ return;
}
DEBUG ("created %s", obj_path);
@@ -1586,9 +1591,9 @@ _mcd_connection_connect_with_params (McdConnection *connection,
DEBUG ("Trying connect account: %s",
mcd_account_get_unique_name (priv->account));
- mcd_account_set_connection_status (priv->account,
- TP_CONNECTION_STATUS_CONNECTING,
- TP_CONNECTION_STATUS_REASON_REQUESTED);
+ _mcd_account_set_connection_status (priv->account,
+ TP_CONNECTION_STATUS_CONNECTING,
+ TP_CONNECTION_STATUS_REASON_REQUESTED);
/* TODO: add extra parameters? */
tp_cli_connection_manager_call_request_connection (priv->tp_conn_mgr, -1,
@@ -1617,12 +1622,12 @@ _mcd_connection_release_tp_connection (McdConnection *connection)
McdConnectionPrivate *priv = MCD_CONNECTION_PRIV (connection);
DEBUG ("%p", connection);
- mcd_account_set_current_presence (priv->account,
- TP_CONNECTION_PRESENCE_TYPE_OFFLINE,
- "offline", NULL);
- mcd_account_set_connection_status (priv->account,
- TP_CONNECTION_STATUS_DISCONNECTED,
- priv->abort_reason);
+ _mcd_account_set_current_presence (priv->account,
+ TP_CONNECTION_PRESENCE_TYPE_OFFLINE,
+ "offline", NULL);
+ _mcd_account_set_connection_status (priv->account,
+ TP_CONNECTION_STATUS_DISCONNECTED,
+ priv->abort_reason);
if (priv->tp_conn)
{
/* Disconnect signals */
@@ -2528,9 +2533,9 @@ _mcd_connection_set_tp_connection (McdConnection *connection,
obj_path, error);
if (!priv->tp_conn)
{
- mcd_account_set_connection_status (priv->account,
- TP_CONNECTION_STATUS_DISCONNECTED,
- TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
+ _mcd_account_set_connection_status (priv->account,
+ TP_CONNECTION_STATUS_DISCONNECTED,
+ TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
return;
}
_mcd_account_tp_connection_changed (priv->account);
--
1.5.6.5
More information about the telepathy-commits
mailing list