Cleaning the API a bit more.

[citadel.git] / citadel / modules / autocompletion / serv_autocompletion.c

diff --git a/citadel/modules/autocompletion/serv_autocompletion.c b/citadel/modules/autocompletion/serv_autocompletion.c
index 5aaedd8cbfa875caed9616f9941759bca84c8959..28cc0bec457bbd5d2dc8b30070e7f89bc17941ec 100644 (file)
--- a/citadel/modules/autocompletion/serv_autocompletion.c
+++ b/citadel/modules/autocompletion/serv_autocompletion.c
@@ -2,52 +2,27 @@
  * $Id$
  *
  * Autocompletion of email recipients, etc.
+ *
+ * Copyright (c) 1987-2009 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 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>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <signal.h>
-#include <pwd.h>
-#include <errno.h>
-#include <sys/types.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 <sys/wait.h>
-#include <string.h>
-#include <limits.h>
-#include "citadel.h"
-#include "server.h"
-#include "citserver.h"
-#include "support.h"
-#include "config.h"
-#include "tools.h"
-#include "msgbase.h"
-#include "user_ops.h"
-#include "room_ops.h"
-#include "database.h"
-#include "vcard.h"
-#include "serv_autocompletion.h"
-
 #include "ctdl_module.h"
 
 
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
+#include "serv_autocompletion.h"
 
 
 
@@ -189,7 +164,7 @@ void cmd_auto(char *argbuf) {
         * Gather up message pointers in rooms containing vCards
         */
        for (r=0; r < (sizeof(rooms_to_try) / sizeof(char *)); ++r) {
-               if (getroom(&CC->room, rooms_to_try[r]) == 0) {
+               if (CtdlGetRoom(&CC->room, rooms_to_try[r]) == 0) {
                        cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
                        if (cdbfr != NULL) {
                                msglist = realloc(msglist, (num_msgs * sizeof(long)) + cdbfr->len + 1);
@@ -239,7 +214,7 @@ void cmd_auto(char *argbuf) {
        
        cprintf("000\n");
        if (strcmp(CC->room.QRname, hold_rm)) {
-               getroom(&CC->room, hold_rm);    /* return to saved room */
+               CtdlGetRoom(&CC->room, hold_rm);    /* return to saved room */
        }
 
        if (msglist) {
@@ -250,8 +225,10 @@ void cmd_auto(char *argbuf) {
 
 
 CTDL_MODULE_INIT(autocompletion) {
-       CtdlRegisterProtoHook(cmd_auto, "AUTO", "Do recipient autocompletion");
-
+       if (!threading)
+       {
+               CtdlRegisterProtoHook(cmd_auto, "AUTO", "Do recipient autocompletion");
+       }
        /* return our Subversion id for the Log */
        return "$Id$";
 }