* src/mod_muc/mod_muc_room.erl: Move definitions to header file

* src/mod_muc/mod_muc_room.hrl: New header file
* src/Makefile.in: Likewise

SVN Revision: 1698

diff --git a/ChangeLog b/ChangeLog
index f906b18f8a8d2996a9afaa6025055ae728cc96ea..2aea5671841d603135833318d74e78052923c3f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-02  Badlop  <badlop@process-one.net>
+
+       * src/mod_muc/mod_muc_room.erl: Move definitions to header file
+       * src/mod_muc/mod_muc_room.hrl: New header file
+       * src/Makefile.in: Likewise
+
 2008-12-01  Badlop  <badlop@process-one.net>
 
        * doc/guide.tex: New subsection Database Connection

diff --git a/src/Makefile.in b/src/Makefile.in
index 096af8b5ac8be89ed6a2b2b7ac7afdb77bed4999..8917df636683eb91fdbb8a41ac959aca57e0cff4 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -194,6 +194,8 @@ install: all
        install -m 644 *.hrl $(INCLUDEDIR)
        install -d $(INCLUDEDIR)/eldap/
        install -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/
+       install -d $(INCLUDEDIR)/mod_muc/
+       install -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/
        install -d $(INCLUDEDIR)/mod_proxy65/
        install -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/
        install -d $(INCLUDEDIR)/mod_pubsub/

diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 85f3b6a9a184dc78d82f7393da8c5e3c5175e12f..22cf17913fc6994f3d23003912fb848c5b6e3cbc 100644 (file)
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -48,70 +48,11 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("mod_muc_room.hrl").
 
--define(MAX_USERS_DEFAULT, 200).
 -define(MAX_USERS_DEFAULT_LIST,
        [5, 10, 20, 30, 50, 100, 200, 500, 1000, 2000, 5000]).
 
--define(SETS, gb_sets).
--define(DICT, dict).
-
--record(lqueue, {queue, len, max}).
-
--record(config, {title = "",
-                description = "",
-                allow_change_subj = true,
-                allow_query_users = true,
-                allow_private_messages = true,
-                 allow_visitor_status = true,
-                 allow_visitor_nickchange = true,
-                public = true,
-                public_list = true,
-                persistent = false,
-                moderated = true,
-                members_by_default = true,
-                members_only = false,
-                allow_user_invites = false,
-                password_protected = false,
-                password = "",
-                anonymous = true,
-                max_users = ?MAX_USERS_DEFAULT,
-                logging = false
-               }).
-
--record(user, {jid,
-              nick,
-              role,
-              last_presence}).
-
--record(activity, {message_time = 0,
-                  presence_time = 0,
-                  message_shaper,
-                  presence_shaper,
-                  message,
-                  presence}).
-
--record(state, {room,
-               host,
-               server_host,
-               access,
-               jid,
-               config = #config{},
-               users = ?DICT:new(),
-               affiliations = ?DICT:new(),
-               history = lqueue_new(20),
-               subject = "",
-               subject_author = "",
-               just_created = false,
-               activity = treap:empty(),
-               room_shaper,
-               room_queue = queue:new()}).
-
--record(muc_online_users, {us,
-                          room,
-                          host}).
-
-
 %-define(DBGFSM, true).
 
 -ifdef(DBGFSM).

diff --git a/src/mod_muc/mod_muc_room.hrl b/src/mod_muc/mod_muc_room.hrl
new file mode 100644 (file)
index 0000000..790e706
--- /dev/null
+++ b/src/mod_muc/mod_muc_room.hrl
@@ -0,0 +1,80 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%                         
+%%% You should have received a copy of the GNU General Public License
+%%% along with this program; if not, write to the Free Software
+%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 02111-1307 USA
+%%%
+%%%----------------------------------------------------------------------
+
+-define(MAX_USERS_DEFAULT, 200).
+
+-define(SETS, gb_sets).
+-define(DICT, dict).
+
+-record(lqueue, {queue, len, max}).
+
+-record(config, {title = "",
+                description = "",
+                allow_change_subj = true,
+                allow_query_users = true,
+                allow_private_messages = true,
+                allow_visitor_status = true,
+                allow_visitor_nickchange = true,
+                public = true,
+                public_list = true,
+                persistent = false,
+                moderated = true,
+                members_by_default = true,
+                members_only = false,
+                allow_user_invites = false,
+                password_protected = false,
+                password = "",
+                anonymous = true,
+                max_users = ?MAX_USERS_DEFAULT,
+                logging = false
+               }).
+
+-record(user, {jid,
+              nick,
+              role,
+              last_presence}).
+
+-record(activity, {message_time = 0,
+                  presence_time = 0,
+                  message_shaper,
+                  presence_shaper,
+                  message,
+                  presence}).
+
+-record(state, {room,
+               host,
+               server_host,
+               access,
+               jid,
+               config = #config{},
+               users = ?DICT:new(),
+               affiliations = ?DICT:new(),
+               history = lqueue_new(20),
+               subject = "",
+               subject_author = "",
+               just_created = false,
+               activity = treap:empty(),
+               room_shaper,
+               room_queue = queue:new()}).
+
+-record(muc_online_users, {us,
+                          room,
+                          host}).