X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnotes%2Fserv_notes.c;h=694f4eacdd2367f98bed2376d5cf1b564779a8e6;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=a250c8ccd63a652d7a317d1f33ad99ee7256a1c5;hpb=55013f95f08eafe1b375df4241e8defe387c6cdc;p=citadel.git

diff --git a/citadel/modules/notes/serv_notes.c b/citadel/modules/notes/serv_notes.c
index a250c8ccd..694f4eacd 100644
--- a/citadel/modules/notes/serv_notes.c
+++ b/citadel/modules/notes/serv_notes.c
@@ -3,19 +3,13 @@
  *
  * Copyright (c) 2007-2012 by the citadel.org team
  *
- *  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 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.
- *
- *  
- *  
- *  
+ * 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.
  */
 
 #include "sysdep.h"
@@ -27,18 +21,7 @@
 #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 <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -51,7 +34,6 @@
 #include "user_ops.h"
 #include "database.h"
 #include "msgbase.h"
-
 #include "ctdl_module.h"
 
 
@@ -130,12 +112,11 @@ int serv_notes_beforesave(struct CtdlMessage *msg, recptypes *recp)
 
 	/* Modern clients are using vNote format.  Check for one... */
 
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*notes_extract_vnote,
-		NULL, NULL,
-		&v,		/* user data ptr - put the vnote here */
-		0
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *notes_extract_vnote,
+		    NULL, NULL,
+		    &v,		/* user data ptr - put the vnote here */
+		    0
 	);
 
 	if (v == NULL) return(0);	/* no vNotes were found in this message */