X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgpinvoke.c;h=04096fd98e90214eb422d4d1bb7e065302b6631f;hp=9c6e89b0419e878e399f8cd064d5f576cbddea14;hb=b21e95b6f27174909ff28e8e95c13bec01e87f28;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/pgpinvoke.c b/pgpinvoke.c
index 9c6e89b..04096fd 100644
--- a/pgpinvoke.c
+++ b/pgpinvoke.c
@@ -1,22 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1997-2000 Thomas Roessler <roessler@does-not-exist.org>
- * 
- *     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, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /* This file contains the new pgp invocation code.  Note that this
@@ -37,12 +25,18 @@
 #include <fcntl.h>
 #include <time.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "pgp.h"
 #include "rfc822.h"
 
+#include "lib/str.h"
+#include "lib/debug.h"
+
 /*
  * The actual command line formatter.
  */
@@ -147,7 +141,7 @@ void mutt_pgp_command (char *d, size_t dlen, struct pgp_command_context *cctx,
 {
   mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_pgp_command,
                      (unsigned long) cctx, 0);
-  dprint (2, (debugfile, "mutt_pgp_command: %s\n", d));
+  debug_print (2, ("%s\n", d));
 }
 
 /*