--------------Boundary-00=_4Q3H64GNUGT61O8MQZOG Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Subject: Hi all, I've made a first attempt to move the pgp code into libkdenetwork. It works at least for me, but is a bit dirty because of the busy pointer stuff. Kpgp is now a abstract class, each application using it must create its own implementation. The virtual functions virtual void setBusy() =0; virtual bool isBusy() =0; virtual void idle() =0; must be implemented. The implementation in KMail is obvious, in KNode I leave them empty. The only problem are the static methods using the kpgpObject. Each application must create such an object (no problem), and it must never delete it. The latter is a problem, I don't know how to implement it. But anyway, it works now. Some small changes in the pgp-code: - in the desctructor of Kpgp I've added the line if (kpgpObject == this) kpgpObject = 0; to make it easier to find the problem if an application deletes its kpgpObject - in the config dialog I changed the sentence "are not encrypted by KMail." to "are not encrypted by the Pgp module." - the constructor of the config dialog gets a boolean flag to disable the encrypt to self check box, because KNode doesn't use encryption I've created a Wrapper class for KMail. The header and source files are attached. The cvs diff also. You just need to remove kpgp* and apply the patch. BTW, who is the current maintainer of the pgp code? Mathias PS: libkdentwork contains the backport of the qregexp from Qt3. Maybe you want use it for your filters? --------------Boundary-00=_4Q3H64GNUGT61O8MQZOG Content-Type: text/x-c++; charset="iso-8859-1"; name="kmpgpwrap.cpp" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="kmpgpwrap.cpp" I2luY2x1ZGUgPGtwZ3AuaD4KI2luY2x1ZGUgImtta2VybmVsLmgiCiNpbmNsdWRlICJrbXBncHdy YXAuaCIKI2luY2x1ZGUgImtidXN5cHRyLmgiCgpLTXBncFdyYXA6OktNcGdwV3JhcCgpCiAgOiBL cGdwKCkKewp9CgpLTXBncFdyYXA6On5LTXBncFdyYXAoKQp7Cn0KCnZvaWQgS01wZ3BXcmFwOjpz ZXRCdXN5KCkKewogIGtlcm5lbC0+a2JwKCktPmJ1c3koKTsKfQoKYm9vbCBLTXBncFdyYXA6Omlz QnVzeSgpCnsKICByZXR1cm4ga2VybmVsLT5rYnAoKS0+aXNCdXN5KCk7Cn0KCnZvaWQgS01wZ3BX cmFwOjppZGxlKCkKewogIGtlcm5lbC0+a2JwKCktPmlkbGUoKTsKfQoK --------------Boundary-00=_4Q3H64GNUGT61O8MQZOG Content-Type: text/x-c++; charset="iso-8859-1"; name="kmpgpwrap.h" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="kmpgpwrap.h" I2lmbmRlZiBLTVBHUFdSQVBfSAojZGVmaW5lIEtNUEdQV1JBUF9ICgojaW5jbHVkZSA8a3BncC5o PgoKY2xhc3MgS01wZ3BXcmFwIDogcHVibGljIEtwZ3AKewpwdWJsaWM6CiAgS01wZ3BXcmFwKCk7 CiAgdmlydHVhbCB+S01wZ3BXcmFwKCk7CiAgdmlydHVhbCB2b2lkIHNldEJ1c3koKTsKICB2aXJ0 dWFsIGJvb2wgaXNCdXN5KCk7CiAgdmlydHVhbCB2b2lkIGlkbGUoKTsKfTsKCiNlbmRpZgo= --------------Boundary-00=_4Q3H64GNUGT61O8MQZOG Content-Type: text/plain; charset="iso-8859-1"; name="cvs.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="cvs.diff" SW5kZXg6IE1ha2VmaWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVuZXR3 b3JrL2ttYWlsL01ha2VmaWxlLmFtLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEwNwpkaWZmIC11 IC0zIC1wIC1yMS4xMDcgTWFrZWZpbGUuYW0KLS0tIE1ha2VmaWxlLmFtCTIwMDEvMDQvMDMgMjE6 NTY6MDAJMS4xMDcKKysrIE1ha2VmaWxlLmFtCTIwMDEvMDQvMDggMTI6MzM6MTAKQEAgLTEsMTIg KzEsMTIgQEAKIEtERV9DWFhGTEFHUyA9ICQoVVNFX1JUVEkpIC1VUVRfTk9fQVNDSUlfQ0FTVCAt VVFUX05PX0NPTVBBVAogCiBTVUJESVJTID0gYWJvdXQgcGljcwotSU5DTFVERVMgPSAkKGFsbF9p bmNsdWRlcykKLUxEQURECT0gJChMSUJfS0hUTUwpIC1sa3NwZWxsIC1sbWltZWxpYiAtbGthYiAk KExJQl9LRklMRSkKK0lOQ0xVREVTID0gLUkkKHRvcF9zcmNkaXIpL2xpYmtkZW5ldHdvcmsgJChh bGxfaW5jbHVkZXMpCitMREFERAk9ICQoTElCX0tIVE1MKSAtbGtkZW5ldHdvcmsgLWxrc3BlbGwg LWxtaW1lbGliIC1sa2FiICQoTElCX0tGSUxFKQogCiBiaW5fUFJPR1JBTVMgPSBrbWFpbAogCi1r bWFpbF9MREZMQUdTID0gJChhbGxfbGlicmFyaWVzKSAkKEtERV9SUEFUSCkKK2ttYWlsX0xERkxB R1MgPSAtTC4uL2xpYmtkZW5ldHdvcmsgJChhbGxfbGlicmFyaWVzKSAkKEtERV9SUEFUSCkKIGtt YWlsX1NPVVJDRVMgPSBrbXNlbmRlci5jcHAga21tZXNzYWdlLmNwcCBrbW1haW53aW4uY3BwIFwK IAkJa21mb2xkZXJkaWEuY3BwIGttZm9sZGVydHJlZS5jcHAgXAogCQlrbWFjY291bnQuY3BwIGtt aGVhZGVycy5jcHAgXApAQCAtMTksNyArMTksNyBAQCBrbWFpbF9TT1VSQ0VTID0ga21zZW5kZXIu Y3BwIGttbWVzc2FnZS5jCiAJCWttYWNjdHNlbGRsZy5jcHAga21maWx0ZXJtZ3IuY3BwIFwKIAkJ a21maWx0ZXJhY3Rpb24uY3BwIGttaWRlbnRpdHkuY3BwIFwKIAkJa21mb2xkZXJzZWxkbGcuY3Bw IGttZmlsdGVyLmNwcCBrbWZpbHRlcmRsZy5jcHAgXAotCQlrbW1zZ2Jhc2UuY3BwIGttbXNnbGlz dC5jcHAga3BncC5jcHAga3BncGJhc2UuY3BwXAorCQlrbW1zZ2Jhc2UuY3BwIGttbXNnbGlzdC5j cHAga21wZ3B3cmFwLmNwcCBcCiAJCWtmaWxlaW8uY3BwIGttYWRkcmJvb2suY3BwIFwKIAkJa21h ZGRyYm9va2RsZy5jcHAga21pb3N0YXR1c2RsZy5jcHAgXAogCQlrbW5ld2lvc3RhdHVzLmNwcCBr bW5ld2lvc3RhdHVzd2RnLmNwcCBcCkluZGV4OiBrbWNvbXBvc2V3aW4uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K UkNTIGZpbGU6IC9ob21lL2tkZS9rZGVuZXR3b3JrL2ttYWlsL2ttY29tcG9zZXdpbi5jcHAsdgpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuMzI4CmRpZmYgLXUgLTMgLXAgLXIxLjMyOCBrbWNvbXBvc2V3 aW4uY3BwCi0tLSBrbWNvbXBvc2V3aW4uY3BwCTIwMDEvMDQvMDYgMTY6MTA6NDcJMS4zMjgKKysr IGttY29tcG9zZXdpbi5jcHAJMjAwMS8wNC8wOCAxMjozMzoxNQpAQCAtMjAsNyArMjAsNyBAQAog I2luY2x1ZGUgImtmaWxlaW8uaCIKICNpbmNsdWRlICJrYnVzeXB0ci5oIgogI2luY2x1ZGUgImtt bXNncGFydGRsZy5oIgotI2luY2x1ZGUgImtwZ3AuaCIKKyNpbmNsdWRlIDxrcGdwLmg+CiAjaW5j bHVkZSAia21hZGRyYm9va2RsZy5oIgogI2luY2x1ZGUgImttYWRkcmJvb2suaCIKICNpbmNsdWRl ICJrbWlkZW50aXR5LmgiCkluZGV4OiBrbWtlcm5lbC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTog L2hvbWUva2RlL2tkZW5ldHdvcmsva21haWwva21rZXJuZWwuY3BwLHYKcmV0cmlldmluZyByZXZp c2lvbiAxLjM5CmRpZmYgLXUgLTMgLXAgLXIxLjM5IGtta2VybmVsLmNwcAotLS0ga21rZXJuZWwu Y3BwCTIwMDEvMDMvMTMgMTg6NDE6MDAJMS4zOQorKysga21rZXJuZWwuY3BwCTIwMDEvMDQvMDgg MTI6MzM6MTcKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJrYnVzeXB0ci5oIgogI2luY2x1 ZGUgImttYWRkcmJvb2suaCIKICNpbmNsdWRlICJrZmlsZWlvLmgiCisjaW5jbHVkZSAia21wZ3B3 cmFwLmgiCiAjaW5jbHVkZSA8a2FiYXBpLmg+CiAjaW5jbHVkZSA8a3dpbi5oPgogCkBAIC00Niw2 ICs0Nyw3IEBAIEtNS2VybmVsOjpLTUtlcm5lbCAoUU9iamVjdCAqcGFyZW50LCBjb24KIHsKICAg Ly9rZERlYnVnKCkgPDwgIktNS2VybmVsOjpLTUtlcm5lbCIgPDwgZW5kbDsKICAgbXlTZWxmID0g dGhpczsKKyAgbmV3IEtNcGdwV3JhcCgpOwogfQogCiBLTUtlcm5lbDo6fktNS2VybmVsICgpCklu ZGV4OiBrbW1lc3NhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVuZXR3 b3JrL2ttYWlsL2ttbWVzc2FnZS5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTgyCmRpZmYg LXUgLTMgLXAgLXIxLjE4MiBrbW1lc3NhZ2UuY3BwCi0tLSBrbW1lc3NhZ2UuY3BwCTIwMDEvMDQv MDYgMTI6NTE6MzQJMS4xODIKKysrIGttbWVzc2FnZS5jcHAJMjAwMS8wNC8wOCAxMjozMzoyMQpA QCAtOCw3ICs4LDcgQEAKICNpbmNsdWRlICJrbW1zZ3BhcnQuaCIKICNpbmNsdWRlICJrbW1zZ2lu Zm8uaCIKICNpbmNsdWRlICJrbXJlYWRlcndpbi5oIgotI2luY2x1ZGUgImtwZ3AuaCIKKyNpbmNs dWRlIDxrcGdwLmg+CiAKICNpbmNsdWRlICJrbWZvbGRlci5oIgogI2luY2x1ZGUgImttdW5kb3N0 YWNrLmgiCkluZGV4OiBrbXJlYWRlcndpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUv a2RlL2tkZW5ldHdvcmsva21haWwva21yZWFkZXJ3aW4uY3BwLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjI1OApkaWZmIC11IC0zIC1wIC1yMS4yNTgga21yZWFkZXJ3aW4uY3BwCi0tLSBrbXJlYWRl cndpbi5jcHAJMjAwMS8wNC8wNSAyMDoxOTowOQkxLjI1OAorKysga21yZWFkZXJ3aW4uY3BwCTIw MDEvMDQvMDggMTI6MzM6MjQKQEAgLTQ0LDcgKzQ0LDcgQEAKICNpbmNsdWRlICJrZmlsZWlvLmgi CiAjaW5jbHVkZSAia2J1c3lwdHIuaCIKICNpbmNsdWRlICJrbW1zZ3BhcnRkbGcuaCIKLSNpbmNs dWRlICJrcGdwLmgiCisjaW5jbHVkZSA8a3BncC5oPgogI2luY2x1ZGUgImt1cmwuaCIKIAogLy8g Zm9yIHNlbGVjdGlvbgo= --------------Boundary-00=_4Q3H64GNUGT61O8MQZOG-- _______________________________________________ Kmail Developers mailing list Kmail@master.kde.org http://master.kde.org/mailman/listinfo/kmail