---
src/voicecall.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/voicecall.c b/src/voicecall.c
index 8e4ab58..e55f44b 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -2756,6 +2756,38 @@ static void emulator_mpty_join_cb(const struct
ofono_error *error, void *data)
g_free(mp);
}
+static void emulator_mpty_private_chat_cb(const struct ofono_error *error,
+ void *data)
+{
+ struct mpty_cb_info *mp = data;
+ GSList *old;
+ GSList *l;
+
+ ofono_emulator_send_final(mp->em, error);
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+ g_free(mp);
+ return;
+ }
+
+ old = g_slist_copy(mp->vc->multiparty_list);
+
+ l = g_slist_find_custom(mp->vc->multiparty_list,
+ GINT_TO_POINTER(mp->id), call_compare_by_id);
+
+ if (l) {
+ mp->vc->multiparty_list =
+ g_slist_remove(mp->vc->multiparty_list, l->data);
+
+ if (mp->vc->multiparty_list->next == NULL) {
+ g_slist_free(mp->vc->multiparty_list);
+ mp->vc->multiparty_list = 0;
+ }
+ }
+
+ voicecalls_multiparty_changed(old, mp->vc->multiparty_list);
+ g_slist_free(old);
+ g_free(mp);
}
static void emulator_ata_cb(struct ofono_emulator *em,
@@ -2990,11 +3022,35 @@ static void emulator_chld_cb(struct ofono_emulator *em,
}
if (chld >= 21 && chld <= 27) {
+ GSList *l;
+ struct mpty_cb_info *mp;
+ unsigned int id = chld - 20;
+
if (vc->driver->private_chat == NULL)
goto fail;
- vc->driver->private_chat(vc, chld - 20,
- emulator_generic_cb, em);
+ for (l = vc->multiparty_list; l; l = l->next) {
+ struct voicecall *v = l->data;
+ if (v->call->id == id)
+ break;
+ }
+
+ if (l == NULL)
+ goto fail;
+
+ if (voicecalls_have_held(vc))
+ goto fail;
+
+ mp = g_try_malloc0(sizeof(struct mpty_cb_info));
+ if (!mp)
+ goto fail;
+
+ mp->vc = vc;
+ mp->em = em;
+ mp->id = id;
+
+ vc->driver->private_chat(vc, id,
+ emulator_mpty_private_chat_cb, mp);
return;
}
--
1.7.1
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
