]> granicus.if.org Git - ejabberd/commitdiff
* src/mod_muc/mod_muc_room.erl: Added an option set affiliations.
authorMickaël Rémond <mickael.remond@process-one.net>
Mon, 19 Feb 2007 16:56:06 +0000 (16:56 +0000)
committerMickaël Rémond <mickael.remond@process-one.net>
Mon, 19 Feb 2007 16:56:06 +0000 (16:56 +0000)
SVN Revision: 734

ChangeLog
src/mod_muc/mod_muc_room.erl

index 757784bb89689fcc963059f1d38f90a31c4e8637..c4e30e4af12574ef23e0ab101230b850b3eeb5c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-02-19  Mickael Remond  <mickael.remond@process-one.net>
 
+       * src/mod_muc/mod_muc_room.erl: Added an option set affiliations.
+
        * doc/api/*: Added Erlang documentation generation script (EJAB-188).
        * doc/version.tex: Updated.
        * src/ejabberd.app: Updated.
index 5a821f8f1c002600be64941ed9a8d29c728bc0d3..6c7d061058df329e8aad02d2cc52f43af6fdfaea 100644 (file)
@@ -621,6 +621,9 @@ handle_event({destroy, Reason}, _StateName, StateData) ->
 handle_event(destroy, StateName, StateData) ->
     handle_event({destroy, none}, StateName, StateData);
 
+handle_event({set_affiliations, Affiliations}, StateName, StateData) ->
+    {next_state, StateName, StateData#state{affiliations = Affiliations}};
+
 handle_event(_Event, StateName, StateData) ->
     {next_state, StateName, StateData}.
 
@@ -664,12 +667,12 @@ handle_sync_event({get_disco_item, JID, Lang}, _From, StateName, StateData) ->
            end,
     {reply, Reply, StateName, StateData};
 handle_sync_event(get_config, _From, StateName, StateData) ->
-    {reply, StateData#state.config, StateName, StateData};
+    {reply, {ok, StateData#state.config}, StateName, StateData};
 handle_sync_event(get_state, _From, StateName, StateData) ->
-    {reply, StateData, StateName, StateData};
+    {reply, {ok, StateData}, StateName, StateData};
 handle_sync_event({change_config, Config}, _From, StateName, StateData) ->
     {result, [], NSD} = change_config(Config, StateData),
-    {reply, NSD#state.config, StateName, NSD};
+    {reply, {ok, NSD#state.config}, StateName, NSD};
 handle_sync_event(_Event, _From, StateName, StateData) ->
     Reply = ok,
     {reply, Reply, StateName, StateData}.