Index: Makefile.am
===================================================================
RCS file: /home/kde/kdenetwork/kmail/Makefile.am,v
retrieving revision 1.107
diff -u -3 -p -r1.107 Makefile.am
--- Makefile.am	2001/04/03 21:56:00	1.107
+++ Makefile.am	2001/04/08 12:33:10
@@ -1,12 +1,12 @@
 KDE_CXXFLAGS = $(USE_RTTI) -UQT_NO_ASCII_CAST -UQT_NO_COMPAT
 
 SUBDIRS = about pics
-INCLUDES = $(all_includes)
-LDADD	= $(LIB_KHTML) -lkspell -lmimelib -lkab $(LIB_KFILE)
+INCLUDES = -I$(top_srcdir)/libkdenetwork $(all_includes)
+LDADD	= $(LIB_KHTML) -lkdenetwork -lkspell -lmimelib -lkab $(LIB_KFILE)
 
 bin_PROGRAMS = kmail
 
-kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kmail_LDFLAGS = -L../libkdenetwork $(all_libraries) $(KDE_RPATH)
 kmail_SOURCES = kmsender.cpp kmmessage.cpp kmmainwin.cpp \
 		kmfolderdia.cpp kmfoldertree.cpp \
 		kmaccount.cpp kmheaders.cpp \
@@ -19,7 +19,7 @@ kmail_SOURCES = kmsender.cpp kmmessage.c
 		kmacctseldlg.cpp kmfiltermgr.cpp \
 		kmfilteraction.cpp kmidentity.cpp \
 		kmfolderseldlg.cpp kmfilter.cpp kmfilterdlg.cpp \
-		kmmsgbase.cpp kmmsglist.cpp kpgp.cpp kpgpbase.cpp\
+		kmmsgbase.cpp kmmsglist.cpp kmpgpwrap.cpp \
 		kfileio.cpp kmaddrbook.cpp \
 		kmaddrbookdlg.cpp kmiostatusdlg.cpp \
 		kmnewiostatus.cpp kmnewiostatuswdg.cpp \
Index: kmcomposewin.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmcomposewin.cpp,v
retrieving revision 1.328
diff -u -3 -p -r1.328 kmcomposewin.cpp
--- kmcomposewin.cpp	2001/04/06 16:10:47	1.328
+++ kmcomposewin.cpp	2001/04/08 12:33:15
@@ -20,7 +20,7 @@
 #include "kfileio.h"
 #include "kbusyptr.h"
 #include "kmmsgpartdlg.h"
-#include "kpgp.h"
+#include <kpgp.h>
 #include "kmaddrbookdlg.h"
 #include "kmaddrbook.h"
 #include "kmidentity.h"
Index: kmkernel.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmkernel.cpp,v
retrieving revision 1.39
diff -u -3 -p -r1.39 kmkernel.cpp
--- kmkernel.cpp	2001/03/13 18:41:00	1.39
+++ kmkernel.cpp	2001/04/08 12:33:17
@@ -31,6 +31,7 @@
 #include "kbusyptr.h"
 #include "kmaddrbook.h"
 #include "kfileio.h"
+#include "kmpgpwrap.h"
 #include <kabapi.h>
 #include <kwin.h>
 
@@ -46,6 +47,7 @@ KMKernel::KMKernel (QObject *parent, con
 {
   //kdDebug() << "KMKernel::KMKernel" << endl;
   mySelf = this;
+  new KMpgpWrap();
 }
 
 KMKernel::~KMKernel ()
Index: kmmessage.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmmessage.cpp,v
retrieving revision 1.182
diff -u -3 -p -r1.182 kmmessage.cpp
--- kmmessage.cpp	2001/04/06 12:51:34	1.182
+++ kmmessage.cpp	2001/04/08 12:33:21
@@ -8,7 +8,7 @@
 #include "kmmsgpart.h"
 #include "kmmsginfo.h"
 #include "kmreaderwin.h"
-#include "kpgp.h"
+#include <kpgp.h>
 
 #include "kmfolder.h"
 #include "kmundostack.h"
Index: kmreaderwin.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmreaderwin.cpp,v
retrieving revision 1.258
diff -u -3 -p -r1.258 kmreaderwin.cpp
--- kmreaderwin.cpp	2001/04/05 20:19:09	1.258
+++ kmreaderwin.cpp	2001/04/08 12:33:24
@@ -44,7 +44,7 @@
 #include "kfileio.h"
 #include "kbusyptr.h"
 #include "kmmsgpartdlg.h"
-#include "kpgp.h"
+#include <kpgp.h>
 #include "kurl.h"
 
 // for selection