Attachment 68640 Details for Bug 56044 – base-call-channel: Set state to ENDED in hangup only if not set

[patch] base-call-channel: Set state to ENDED in hangup only if not set

0001-base-call-channel-Set-state-to-ENDED-in-hangup-only-.patch (text/plain), 1.37 KB, created by Debarshi Ray on 2012-10-16 18:36:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Debarshi Ray

Created: 2012-10-16 18:36:26 UTC

Size: 1.37 KB

patch

obsolete

>From 0782268f203de61956dfc96d9211ebd48cf722bb Mon Sep 17 00:00:00 2001
>From: Debarshi Ray <rishi@gnu.org>
>Date: Tue, 16 Oct 2012 20:33:37 +0200
>Subject: [PATCH] base-call-channel: Set state to ENDED in hangup only if not
> set
>
>This avoids an extra CallStateChanged signal from being emitted if the
>implementation of the hangup virtual method already set the state to
>ENDED.
>
>Fixes: https://bugs.freedesktop.org/56044
>---
> telepathy-glib/base-call-channel.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/telepathy-glib/base-call-channel.c b/telepathy-glib/base-call-channel.c
>index af82ba1..055c006 100644
>--- a/telepathy-glib/base-call-channel.c
>+++ b/telepathy-glib/base-call-channel.c
>@@ -1438,9 +1438,13 @@ tp_base_call_channel_hangup (TpSvcChannelTypeCall *iface,
>   if (klass->hangup != NULL)
>     klass->hangup (self, reason, detailed_reason, message);
> 
>-  tp_base_call_channel_set_state (self, TP_CALL_STATE_ENDED,
>-      tp_base_channel_get_self_handle (tp_base),
>-      reason, detailed_reason, message);
>+  if (tp_base_call_channel_get_state (TP_BASE_CALL_CHANNEL (self)) !=
>+      TP_CALL_STATE_ENDED)
>+    {
>+      tp_base_call_channel_set_state (self, TP_CALL_STATE_ENDED,
>+          tp_base_channel_get_self_handle (tp_base),
>+          reason, detailed_reason, message);
>+    }
> 
>   tp_svc_channel_type_call_return_from_hangup (context);
> }
>-- 
>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.