X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Froomchat%2Fserv_roomchat.c;h=35a83dbacbc7057e770033578d3106725b3de7be;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=225f0861c237b17bb8f05e6a00bece7c93d338aa;hpb=1584426db07095ea60e782c96a74128880b04d3a;p=citadel.git

diff --git a/citadel/modules/roomchat/serv_roomchat.c b/citadel/modules/roomchat/serv_roomchat.c
index 225f0861c..35a83dbac 100644
--- a/citadel/modules/roomchat/serv_roomchat.c
+++ b/citadel/modules/roomchat/serv_roomchat.c
@@ -1,22 +1,15 @@
 /*
  * This module handles instant messaging between users.
  * 
- * Copyright (c) 2010 by the citadel.org team
+ * Copyright (c) 2012 by the citadel.org team
  *
- * 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 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
  * 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
- *
  */
 #include "sysdep.h"
 #include <stdlib.h>
@@ -28,18 +21,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <assert.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -51,14 +33,8 @@
 #include "config.h"
 #include "msgbase.h"
 #include "user_ops.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
 #include "ctdl_module.h"
 
-
 struct chatmsg {
 	struct chatmsg *next;
 	time_t timestamp;
@@ -267,10 +243,10 @@ CTDL_MODULE_INIT(roomchat)
 	if (!threading)
 	{
 		CtdlRegisterProtoHook(cmd_rcht, "RCHT", "Participate in real time chat in a room");
-		CtdlRegisterSessionHook(roomchat_timer, EVT_TIMER);
-		CtdlRegisterSessionHook(roomchat_shutdown, EVT_SHUTDOWN);
+		CtdlRegisterSessionHook(roomchat_timer, EVT_TIMER, PRIO_CLEANUP + 400);
+		CtdlRegisterSessionHook(roomchat_shutdown, EVT_SHUTDOWN, PRIO_SHUTDOWN + 55);
 	}
 	
-	/* return our Subversion id for the Log */
+	/* return our module name for the log */
 	return "roomchat";
 }