summaryrefslogtreecommitdiff
path: root/telepathy-glib/base-call-channel.c
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.co.uk>2012-01-03 12:34:56 +0100
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-01-10 09:52:48 +0100
commit4f605b73f6cd3a105825cfbdb4043a52a887b00f (patch)
treedaa452ccff94173a30710b76b9268a5ced927cd1 /telepathy-glib/base-call-channel.c
parentfd32df030ad852753161ea08df4ea63819be3d9d (diff)
downloadtelepathy-glib-4f605b73f6cd3a105825cfbdb4043a52a887b00f.tar.gz
Make tp_base_call_channel_is_connected/locall_accepted internal
Diffstat (limited to 'telepathy-glib/base-call-channel.c')
-rw-r--r--telepathy-glib/base-call-channel.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/telepathy-glib/base-call-channel.c b/telepathy-glib/base-call-channel.c
index ad08a7817..2642a400a 100644
--- a/telepathy-glib/base-call-channel.c
+++ b/telepathy-glib/base-call-channel.c
@@ -732,7 +732,7 @@ tp_base_call_channel_set_state (TpBaseCallChannel *self,
/* Move from INITIALISING to INITIALISED if we are already connected */
if (self->priv->state != old_state &&
self->priv->state == TP_CALL_STATE_INITIALISING &&
- tp_base_call_channel_is_connected (self))
+ _tp_base_call_channel_is_connected (self))
{
self->priv->state = TP_CALL_STATE_INITIALISED;
if (tp_base_channel_is_registered (TP_BASE_CHANNEL (self)))
@@ -746,7 +746,7 @@ tp_base_call_channel_set_state (TpBaseCallChannel *self,
/* Move from ACCEPTED to ACTIVE if we are already connected */
if (self->priv->state != old_state &&
self->priv->state == TP_CALL_STATE_ACCEPTED &&
- tp_base_call_channel_is_connected (self))
+ _tp_base_call_channel_is_connected (self))
{
self->priv->state = TP_CALL_STATE_ACTIVE;
if (tp_base_channel_is_registered (TP_BASE_CHANNEL (self)))
@@ -1138,25 +1138,6 @@ tp_base_call_channel_is_accepted (TpBaseCallChannel *self)
return self->priv->accepted;
}
-gboolean
-tp_base_call_channel_is_locally_accepted (TpBaseCallChannel *self)
-{
- g_return_val_if_fail (TP_IS_BASE_CALL_CHANNEL (self), FALSE);
-
- return self->priv->locally_accepted;
-}
-
-gboolean
-tp_base_call_channel_is_connected (TpBaseCallChannel *self)
-{
- TpBaseCallChannelClass *klass = TP_BASE_CALL_CHANNEL_GET_CLASS (self);
-
- if (klass->is_connected)
- return klass->is_connected (self);
- else
- return TRUE;
-}
-
/* DBus method implementation */
static void
@@ -1419,3 +1400,22 @@ _tp_base_call_channel_set_locally_muted (TpBaseCallChannel *self,
tp_svc_channel_type_call_emit_call_state_changed (self, self->priv->state,
self->priv->flags, self->priv->reason, self->priv->details);
}
+
+gboolean
+_tp_base_call_channel_is_locally_accepted (TpBaseCallChannel *self)
+{
+ g_return_val_if_fail (TP_IS_BASE_CALL_CHANNEL (self), FALSE);
+
+ return self->priv->locally_accepted;
+}
+
+gboolean
+_tp_base_call_channel_is_connected (TpBaseCallChannel *self)
+{
+ TpBaseCallChannelClass *klass = TP_BASE_CALL_CHANNEL_GET_CLASS (self);
+
+ if (klass->is_connected)
+ return klass->is_connected (self);
+ else
+ return TRUE;
+}