Commit fef79701 authored by Evangelos Ribeiro Tzaras's avatar Evangelos Ribeiro Tzaras
Browse files

Merge branch 'update_byz_include_seconary_call_hangup' into 'pureos/byzantium'

Update byz include seconary call hangup

See merge request !6
parents 04af9c4b e71a76a7
Pipeline #65881 passed with stages
in 6 minutes and 31 seconds
gnome-calls (0.3.0-2pureos2) byzantium; urgency=medium
* d/patches: hang up secondary calls
* Upload to byzantium
-- Evangelos Ribeiro Tzaras <evangelos.tzaras@puri.sm> Thu, 18 Mar 2021 20:17:00 +0100
gnome-calls (0.3.0-2pureos1) byzantium; urgency=medium
* Upload to byzantium
......
From 94345e09165bc944505c84bfa84dd57a70321b5b Mon Sep 17 00:00:00 2001
From: Evangelos Ribeiro Tzaras <evangelos.tzaras@puri.sm>
Date: Wed, 24 Feb 2021 09:27:59 +0100
Subject: [PATCH 414/415] manager: hang up secondary calls
---
src/calls-manager.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/calls-manager.c b/src/calls-manager.c
index 2fe367f..7e48a54 100644
--- a/src/calls-manager.c
+++ b/src/calls-manager.c
@@ -40,6 +40,7 @@ struct _CallsManager
gchar *provider_name;
CallsOrigin *default_origin;
CallsManagerState state;
+ CallsCall *primary_call;
};
G_DEFINE_TYPE (CallsManager, calls_manager, G_TYPE_OBJECT);
@@ -140,6 +141,11 @@ add_call (CallsManager *self, CallsCall *call, CallsOrigin *origin)
g_return_if_fail (CALLS_IS_CALL (call));
g_signal_emit (self, signals[SIGNAL_CALL_ADD], 0, call, origin);
+
+ if (self->primary_call == NULL)
+ self->primary_call = call;
+ else
+ calls_call_hang_up (call);
}
static void
@@ -151,6 +157,9 @@ remove_call (CallsManager *self, CallsCall *call, gchar *reason, CallsOrigin *or
/* We ignore the reason for now, because it doesn't give any usefull information */
g_signal_emit (self, signals[SIGNAL_CALL_REMOVE], 0, call, origin);
+
+ if (self->primary_call == call)
+ self->primary_call = NULL;
}
static void
@@ -482,6 +491,7 @@ calls_manager_init (CallsManager *self)
{
self->state = CALLS_MANAGER_STATE_NO_PROVIDER;
self->provider_name = NULL;
+ self->primary_call = NULL;
// Load the contacts provider
self->contacts_provider = calls_contacts_provider_new ();
--
2.30.1
0001-application-Fix-double-free.patch
0002-manager-hang-up-secondary-calls.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment