Attachment 68707 Details for Bug 56044 – base-call-channel: Ignore transitions with the same state

[patch] base-call-channel: Ignore transitions with the same state

0001-base-call-channel-Ignore-transitions-with-the-same-s.patch (text/plain), 1.76 KB, created by Debarshi Ray on 2012-10-17 13:53:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Debarshi Ray

Created: 2012-10-17 13:53:17 UTC

Size: 1.76 KB

patch

obsolete

>From fd0448c174cfd169f297a8e3e306319806c4c074 Mon Sep 17 00:00:00 2001
>From: Debarshi Ray <rishi@gnu.org>
>Date: Wed, 17 Oct 2012 10:50:24 +0200
>Subject: [PATCH 1/2] base-call-channel: Ignore transitions with the same
> state
>
>Fixes: https://bugs.freedesktop.org/56044
>---
> telepathy-glib/base-call-channel.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/telepathy-glib/base-call-channel.c b/telepathy-glib/base-call-channel.c
>index af82ba1..6b994a6 100644
>--- a/telepathy-glib/base-call-channel.c
>+++ b/telepathy-glib/base-call-channel.c
>@@ -791,6 +791,9 @@ tp_base_call_channel_set_state (TpBaseCallChannel *self,
>   self->priv->reason = _tp_base_call_state_reason_new (actor_handle, reason,
>       dbus_reason, message);
> 
>+  if (old_state == state)
>+    return;
>+
>   if (self->priv->state != TP_CALL_STATE_INITIALISED)
>     self->priv->flags &= ~TP_CALL_FLAG_LOCALLY_RINGING;
> 
>@@ -809,8 +812,7 @@ tp_base_call_channel_set_state (TpBaseCallChannel *self,
>       call_state_to_string (self->priv->state));
> 
>   /* Move from INITIALISING to INITIALISED if we are already connected */
>-  if (self->priv->state != old_state &&
>-      self->priv->state == TP_CALL_STATE_INITIALISING &&
>+  if (self->priv->state == TP_CALL_STATE_INITIALISING &&
>       _tp_base_call_channel_is_connected (self))
>     {
>       self->priv->state = TP_CALL_STATE_INITIALISED;
>@@ -827,8 +829,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 &&
>+  if (self->priv->state == TP_CALL_STATE_ACCEPTED &&
>       _tp_base_call_channel_is_connected (self))
>     {
>       self->priv->state = TP_CALL_STATE_ACTIVE;
>-- 
>1.7.12.1
>

Actions: View | Splinter Review

Attachments on bug 56044: 68639 | 68640 | 68678 | 68689 | 68700 | 68701 | 68707

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.