From c7b13ec2fe664b122216a312f2442c9ca26f5f43 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Thu, 12 Aug 2010 13:14:05 -0500
Subject: voicecall: Relax restriction for hangup_active

If hangup_active is present, then a single active call in a 3-way
situation is hung up using hangup_active.
---
 src/voicecall.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/voicecall.c b/src/voicecall.c
index 41976ac9..5a803f78 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -354,7 +354,8 @@ static DBusMessage *voicecall_hangup(DBusConnection *conn,
 			return NULL;
 		}
 
-		if (single_call == TRUE && vc->driver->hangup_active != NULL) {
+		if (voicecalls_num_active(vc) == 1 &&
+				vc->driver->hangup_active != NULL) {
 			vc->pending = dbus_message_ref(msg);
 			vc->driver->hangup_active(vc, generic_callback, vc);
 
-- 
cgit v1.2.3