Mercurial > prosody-hg
comparison util/events.lua @ 7425:0bb98138dacf
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 12 May 2016 18:45:59 +0100 |
| parents | ba83ff7d9bd7 |
| children | e5d00bf4a4d5 c380a22d52d5 |
comparison
equal
deleted
inserted
replaced
| 7423:63141a85beea | 7425:0bb98138dacf |
|---|---|
| 129 if w[i] == wrapper then | 129 if w[i] == wrapper then |
| 130 t_remove(w, i); | 130 t_remove(w, i); |
| 131 end | 131 end |
| 132 end | 132 end |
| 133 if #w == 0 then | 133 if #w == 0 then |
| 134 if event_name == nil then | 134 if event_name == false then |
| 135 global_wrappers = nil; | 135 global_wrappers = nil; |
| 136 else | 136 else |
| 137 wrappers[event_name] = nil; | 137 wrappers[event_name] = nil; |
| 138 end | 138 end |
| 139 end | 139 end |