[telepathy-gabble/master] Notify peer of unhold when all streams are unheld.

Will Thompson will.thompson at collabora.co.uk
Mon Mar 30 10:03:47 PDT 2009


Previously it was called only if at least one stream was still held and
we were moving to either HELD or UNHELD. Whoops.
---
 src/media-channel.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/media-channel.c b/src/media-channel.c
index 757c38c..f4e931d 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -2266,9 +2266,6 @@ stream_hold_state_changed (GabbleMediaStream *stream G_GNUC_UNUSED,
            * state already, so nothing to signal */
           return;
         }
-
-      /* Tell the peer what's happened */
-      inform_peer_of_unhold (self);
     }
   else
     {
@@ -2299,6 +2296,9 @@ stream_hold_state_changed (GabbleMediaStream *stream G_GNUC_UNUSED,
           priv->hold_state = TP_LOCAL_HOLD_STATE_UNHELD;
           priv->hold_state_reason = TP_LOCAL_HOLD_STATE_REASON_NONE;
         }
+
+      /* Tell the peer what's happened */
+      inform_peer_of_unhold (self);
     }
 
   tp_svc_channel_interface_hold_emit_hold_state_changed (self,
-- 
1.5.6.5




More information about the telepathy-commits mailing list