diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_mix_pam.erl | 4 | ||||
| -rw-r--r-- | src/mod_roster.erl | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mod_mix_pam.erl b/src/mod_mix_pam.erl index 379ab3930..7bd6f2a71 100644 --- a/src/mod_mix_pam.erl +++ b/src/mod_mix_pam.erl @@ -226,7 +226,7 @@ get_mix_roster_items(Acc, {LUser, LServer}) -> subscription = both, ask = undefined, groups = [<<"Channels">>], - mix_channel = #mix_roster_channel{'participant-id' = Id} + mix_channel = #mix_roster_channel{participant_id = Id} } end, Channels); _ -> @@ -311,7 +311,7 @@ process_join_result(#iq{from = #jid{} = Channel, subscription = none, ask = undefined, groups = [], - mix_channel = #mix_roster_channel{'participant-id' = ID} + mix_channel = #mix_roster_channel{participant_id = ID} }), % send IQ result ChanID = make_channel_id(Channel, ID), diff --git a/src/mod_roster.erl b/src/mod_roster.erl index fdf9de9f4..b6cf771f0 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -273,10 +273,9 @@ write_roster_version(LUser, LServer, InTransaction) -> %% - the roster version from client don't match current version. -spec process_iq_get(iq()) -> iq(). process_iq_get(#iq{to = To, from = From, - sub_els = [#roster_query{ver = RequestedVersion, mix_annotate = MixAnnotate}]} = IQ) -> + sub_els = [#roster_query{ver = RequestedVersion, mix_annotate = MixEnabled}]} = IQ) -> LUser = To#jid.luser, LServer = To#jid.lserver, - MixEnabled = MixAnnotate == #mix_roster_annotate{}, {ItemsToSend, VersionToSend} = case {mod_roster_opt:versioning(LServer), mod_roster_opt:store_current_id(LServer)} of |