Accidentally merged the configdb branch into master. Reverting.

[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 10a00a7048603818afbeff288742edd4a7efc304..00e190839bda557cdfeb6baafb410bf0f52e4245 100644 (file)
--- a/citadel/modules/autocompletion/serv_autocompletion.c
+++ b/citadel/modules/autocompletion/serv_autocompletion.c
@@ -1,61 +1,20 @@
 /*
- * $Id$
- *
  * Autocompletion of email recipients, etc.
  *
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-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>
-#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 <libcitadel.h>
-#include "support.h"
-#include "config.h"
-#include "serv_autocompletion.h"
-
 #include "ctdl_module.h"
 
 
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
+#include "serv_autocompletion.h"
 
 
 
@@ -103,8 +62,8 @@ void hunt_for_autocomplete(long msgnum, char *search_string) {
        msg = CtdlFetchMessage(msgnum, 1);
        if (msg == NULL) return;
 
-       v = vcard_load(msg->cm_fields['M']);
-       CtdlFreeMessage(msg);
+       v = vcard_load(msg->cm_fields[eMesageText]);
+       CM_Free(msg);
 
        /*
         * Try to match from a friendly name (the "fn" field).  If there is
@@ -257,11 +216,12 @@ void cmd_auto(char *argbuf) {
 }
 
 
-CTDL_MODULE_INIT(autocompletion) {
+CTDL_MODULE_INIT(autocompletion)
+{
        if (!threading)
        {
                CtdlRegisterProtoHook(cmd_auto, "AUTO", "Do recipient autocompletion");
        }
-       /* return our Subversion id for the Log */
-       return "$Id$";
+       /* return our module name for the log */
+       return "autocompletion";
 }