diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-26 19:56:28 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-28 11:32:20 +0100 |
| commit | 4ae0e4fc7cf2d4ffffec1efe8858b95202995333 (patch) | |
| tree | fa8a59b734ceed140c8b193c7937b5950e0d2987 | |
| parent | 9d8bd36fa860a5599733c44763fb3aac5fc72b92 (diff) | |
| download | telepathy-mission-control-4ae0e4fc7cf2d4ffffec1efe8858b95202995333.tar.gz | |
Account: unduplicate get_requested_presence method
_mcd_account_get_requested_presence() is literally identical to
mcd_account_get_requested_presence() except the underscore (okay, and
that the arguments are indented using spaces, not tabs).
Whichever idiot was responsible for introducing the underscored version
removed by this patch should be hunted down and shot on sight.
| -rw-r--r-- | src/mcd-account-priv.h | 5 | ||||
| -rw-r--r-- | src/mcd-account.c | 18 | ||||
| -rw-r--r-- | src/mcd-connection.c | 2 |
3 files changed, 1 insertions, 24 deletions
diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h index 70785ad2..9097ed5c 100644 --- a/src/mcd-account-priv.h +++ b/src/mcd-account-priv.h @@ -181,11 +181,6 @@ G_GNUC_INTERNAL gboolean _mcd_account_set_enabled (McdAccount *account, gboolean write_out, GError **error); -G_GNUC_INTERNAL void _mcd_account_get_requested_presence (McdAccount *account, - TpConnectionPresenceType *presence, - const gchar **status, - const gchar **message); - G_GNUC_INTERNAL gboolean _mcd_account_presence_type_is_settable ( TpConnectionPresenceType type); diff --git a/src/mcd-account.c b/src/mcd-account.c index 3f134c4b..818701e9 100644 --- a/src/mcd-account.c +++ b/src/mcd-account.c @@ -3377,24 +3377,6 @@ mcd_account_get_requested_presence (McdAccount *account, *message = priv->req_presence_message; } -void -_mcd_account_get_requested_presence (McdAccount *account, - TpConnectionPresenceType *presence, - const gchar **status, - const gchar **message) -{ - McdAccountPrivate *priv = account->priv; - - if (presence != NULL) - *presence = priv->req_presence_type; - - if (status != NULL) - *status = priv->req_presence_status; - - if (message != NULL) - *message = priv->req_presence_message; -} - /* TODO: remove when the relative members will become public */ void mcd_account_get_current_presence (McdAccount *account, diff --git a/src/mcd-connection.c b/src/mcd-connection.c index 7ddc9d4c..4b276333 100644 --- a/src/mcd-connection.c +++ b/src/mcd-connection.c @@ -409,7 +409,7 @@ presence_get_statuses_cb (TpProxy *proxy, const GValue *v_statuses, } /* Now the presence info is ready. We can set the presence */ - _mcd_account_get_requested_presence (priv->account, &presence, + mcd_account_get_requested_presence (priv->account, &presence, &status, &message); if (priv->connected) { |