diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-08-17 14:39:27 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-08-17 14:39:27 +0000 |
| commit | 59753b1ea10a83ea770c35b24cd443620913349c (patch) | |
| tree | c5fd1c815cd9f51e0083703845f4d69a2fbd4250 /res/res_jabber.c | |
| parent | 35b9c6a660236e23e6b9102cc641ab11e967a25a (diff) | |
Strip down the old event system
This removes unused code, event types, IE pltypes, and event IE types
where possible and makes several functions private that were once
public. This includes a renumbering of the remaining event and IE types
which breaks binary compatibility with previous versions. The last
remaining consumers of the old event system (or parts thereof) are
main/security_events.c, res/res_security_log.c, tests/test_cel.c,
tests/test_event.c, main/cel.c, and the CEL backends.
Review: https://reviewboard.asterisk.org/r/2703/
(closes issue ASTERISK-22139)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_jabber.c')
| -rw-r--r-- | res/res_jabber.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index 0e373e5e7..0e41cdf77 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -70,7 +70,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/astobj.h" #include "asterisk/astdb.h" #include "asterisk/manager.h" -#include "asterisk/event.h" #include "asterisk/devicestate.h" #include "asterisk/message.h" @@ -3335,7 +3334,6 @@ static int aji_handle_pubsub_event(void *data, ikspak *pak) int oldmsgs, newmsgs; iks *item, *item_content; struct ast_eid pubsub_eid; - struct ast_event *event; unsigned int cachable = AST_DEVSTATE_CACHABLE; item = iks_find(iks_find(iks_find(pak->x, "event"), "items"), "item"); @@ -3374,12 +3372,6 @@ static int aji_handle_pubsub_event(void *data, ikspak *pak) return IKS_FILTER_EAT; } - if (cachable == AST_DEVSTATE_CACHABLE) { - ast_event_queue_and_cache(event); - } else { - ast_event_queue(event); - } - return IKS_FILTER_EAT; } |