[telepathy-gabble/master] Inline inform_peer_of_[un]hold
Will Thompson
will.thompson at collabora.co.uk
Tue Apr 14 04:13:12 PDT 2009
They're called exactly once, and add nothing.
---
src/media-channel-hold.c | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/media-channel-hold.c b/src/media-channel-hold.c
index 4ee02b1..ffa980b 100644
--- a/src/media-channel-hold.c
+++ b/src/media-channel-hold.c
@@ -28,19 +28,6 @@
#include "debug.h"
#include "util.h"
-static void
-inform_peer_of_unhold (GabbleMediaChannel *self)
-{
- gabble_jingle_session_send_held (self->priv->session, FALSE);
-}
-
-
-static void
-inform_peer_of_hold (GabbleMediaChannel *self)
-{
- gabble_jingle_session_send_held (self->priv->session, TRUE);
-}
-
static void
stream_hold_state_changed (GabbleMediaStream *stream G_GNUC_UNUSED,
@@ -153,7 +140,7 @@ stream_hold_state_changed (GabbleMediaStream *stream G_GNUC_UNUSED,
}
/* Tell the peer what's happened */
- inform_peer_of_unhold (self);
+ gabble_jingle_session_send_held (self->priv->session, FALSE);
}
tp_svc_channel_interface_hold_emit_hold_state_changed (self,
@@ -249,7 +236,7 @@ gabble_media_channel_request_hold (TpSvcChannelInterfaceHold *iface,
if (priv->hold_state == TP_LOCAL_HOLD_STATE_UNHELD)
{
- inform_peer_of_hold (self);
+ gabble_jingle_session_send_held (self->priv->session, TRUE);
}
priv->hold_state = TP_LOCAL_HOLD_STATE_PENDING_HOLD;
--
1.5.6.5
More information about the telepathy-commits
mailing list