Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-14 22:00:16 +02:00
Code Releases Activity

fix r2876 compilation warning

Browse Source 
SVN Revision: 2880
This commit is contained in:
Christophe Romain 2010-01-12 12:31:08 +00:00
parent 276f890c50
commit 024b688c1d
3 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod_pubsub/mod_pubsub.erl
View File

@ -3170,13 +3170,12 @@ broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyTyp
subscribed_nodes_by_jid(NotifyType, SubsByDepth) ->
NodesToDeliver = fun(Depth, Node, Subs, Acc) ->
NodeId = case Node#pubsub_node.nodeid of
{_, N} -> N;
Other -> Other
end,
% NodeId = case Node#pubsub_node.nodeid of
% {_, N} -> N;
% Other -> Other
% end,
NodeOptions = Node#pubsub_node.options,
lists:foldl(
fun({LJID, SubID, SubOptions}, {JIDs, Recipients} = Acc) ->
lists:foldl(fun({LJID, SubID, SubOptions}, {JIDs, Recipients}) ->
case is_to_deliver(LJID, NotifyType, Depth, NodeOptions, SubOptions) of
true ->
%% If is to deliver :
@ -3202,7 +3201,8 @@ subscribed_nodes_by_jid(NotifyType, SubsByDepth) ->
% v2: {JIDs, Recipients1}
{JIDs, lists:keyreplace(LJID, 1, Recipients, {LJID, [SubID | SubIDs]})}
end;
false -> {JIDs, Recipients}
false ->
{JIDs, Recipients}
end
end, Acc, Subs)
end,

14
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -2979,13 +2979,12 @@ broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyTyp
subscribed_nodes_by_jid(NotifyType, SubsByDepth) ->
NodesToDeliver = fun(Depth, Node, Subs, Acc) ->
NodeId = case Node#pubsub_node.nodeid of
{_, N} -> N;
Other -> Other
end,
% NodeId = case Node#pubsub_node.nodeid of
% {_, N} -> N;
% Other -> Other
% end,
NodeOptions = Node#pubsub_node.options,
lists:foldl(
fun({LJID, SubID, SubOptions}, {JIDs, Recipients} = Acc) ->
lists:foldl(fun({LJID, SubID, SubOptions}, {JIDs, Recipients}) ->
case is_to_deliver(LJID, NotifyType, Depth, NodeOptions, SubOptions) of
true ->
%% If is to deliver :
@ -3011,7 +3010,8 @@ subscribed_nodes_by_jid(NotifyType, SubsByDepth) ->
% v2: {JIDs, Recipients1}
{JIDs, lists:keyreplace(LJID, 1, Recipients, {LJID, [SubID | SubIDs]})}
end;
false -> {JIDs, Recipients}
false ->
{JIDs, Recipients}
end
end, Acc, Subs)
end,

4
src/mod_pubsub/pubsub_odbc.patch
View File

@ -1,5 +1,5 @@
--- mod_pubsub.erl 2010-01-12 11:24:41.169047172 +0100
+++ mod_pubsub_odbc.erl 2010-01-12 13:11:52.450026878 +0100
--- mod_pubsub.erl 2010-01-12 13:29:25.458216046 +0100
+++ mod_pubsub_odbc.erl 2010-01-12 13:30:14.538046934 +0100
@@ -42,7 +42,7 @@
%%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see
%%% XEP-0060 section 12.18.