From 12b293d6aad5c2161340005a638c8d5bd8739bef Mon Sep 17 00:00:00 2001 From: Ben Langfeld Date: Fri, 21 Jun 2013 13:46:47 -0400 Subject: [PATCH] mod_rayo: Punchblock now supports content-type on input matches Fix applied to Punchblock here: https://github.com/adhearsion/punchblock/commit/cef5198e80b60e19fc949b21f6e0dc438cecc5df --- src/mod/event_handlers/mod_rayo/mod_rayo.h | 1 - src/mod/event_handlers/mod_rayo/rayo_input_component.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.h b/src/mod/event_handlers/mod_rayo/mod_rayo.h index fb197ef915..ec50b78b69 100644 --- a/src/mod/event_handlers/mod_rayo/mod_rayo.h +++ b/src/mod/event_handlers/mod_rayo/mod_rayo.h @@ -45,7 +45,6 @@ /* these are support punchblock.. undefine once punchblock is fixed */ #define RAYO_UUID_IN_REF_URI -#define RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE struct rayo_actor; struct rayo_call; diff --git a/src/mod/event_handlers/mod_rayo/rayo_input_component.c b/src/mod/event_handlers/mod_rayo/rayo_input_component.c index acf2ce4a2f..16e3859ed6 100644 --- a/src/mod/event_handlers/mod_rayo/rayo_input_component.c +++ b/src/mod/event_handlers/mod_rayo/rayo_input_component.c @@ -169,15 +169,11 @@ static int digit_mask_set_from_digits(int digit_mask, const char *digits) */ static void send_match_event(struct rayo_component *component, iks *result) { -#ifdef RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE - rayo_component_send_complete_with_metadata(RAYO_COMPONENT(component), INPUT_MATCH, result, 0); -#else iks *event = rayo_component_create_complete_event(RAYO_COMPONENT(component), INPUT_MATCH); iks *match = iks_find(iks_find(event, "complete"), INPUT_MATCH_TAG); iks_insert_attrib(match, "content-type", "application/nlsml+xml"); iks_insert_cdata(match, iks_string(iks_stack(result), result), 0); rayo_component_send_complete_event(component, event); -#endif } /**