comparison plugins/mod_presence.lua @ 7282:29eedc776bbd

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 14 Mar 2016 18:27:32 +0100
parents 21da137d83b0
children c8ad387aab1c
comparison
equal deleted inserted replaced
7280:8b5a9208c212 7282:29eedc776bbd
25 local NULL = {}; 25 local NULL = {};
26 26
27 local rostermanager = require "core.rostermanager"; 27 local rostermanager = require "core.rostermanager";
28 local sessionmanager = require "core.sessionmanager"; 28 local sessionmanager = require "core.sessionmanager";
29 29
30 local recalc_resource_map = require "util.presencepriority".recalc_resource_map; 30 local recalc_resource_map = require "util.presence".recalc_resource_map;
31 31
32 local ignore_presence_priority = module:get_option_boolean("ignore_presence_priority", false); 32 local ignore_presence_priority = module:get_option_boolean("ignore_presence_priority", false);
33 33
34 function handle_normal_presence(origin, stanza) 34 function handle_normal_presence(origin, stanza)
35 if ignore_presence_priority then 35 if ignore_presence_priority then