From kde-devel Tue May 25 17:50:05 1999 From: Daniel Naber Date: Tue, 25 May 1999 17:50:05 +0000 To: kde-devel Subject: several kmail patches X-MARC-Message: https://marc.info/?l=kde-devel&m=92770409606614 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD" --Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD Content-Type: text/plain Content-Transfer-Encoding: 8bit Hi, I wrote several kmail patches - unfortunately Stefan Taferner (kmailīs maintainer) doesnīt have enough time to care about these at the moment. All patches are bugfixes, thus intended for KDE 1.1.2. I would like you to test them and commit them, if they are okay. Theyīre very small, so Iīll attach them. Short description: bugfix-1037: fixes #1037 (deleting a message in trash seemed to delete two messages) cancel-filter, filter-help-button: dialogīs ok-, cancel- und help-button work correct now sig-append: append the signature with "-- \n" instead of "--\n" (note the sapce). This should be correct, isnīt it? updown-bugfix: moving a filter up could screw the filter list -> fixed (with a sempahore workaround, which is probably stupid. But I donīt know the signal/slot stuff good enough for a better solution). Another point: kmail doesnīt generate an in-reply-to header. I guess (and only guess) that some software needs this to recognize threads? Is this important? If so, is it difficult to include? TIA Daniel -- PGP Key fingerprint = 3D 98 9E D2 00 B6 E0 9D 7E B9 77 23 17 E2 11 6A --Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD Content-Type: text/plain; name="bugfix-1037.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="bugfix-1037.diff" LS0tIGttYWlsX29yZy9rbWhlYWRlcnMuY3BwCU1vbiBBcHIgMjYgMTY6NTA6MDAgMTk5OQorKysg a21haWwva21oZWFkZXJzLmNwcAlTYXQgTWF5ICA4IDIyOjEwOjEzIDE5OTkKQEAgLTU4MiwxMCAr NTgyLDE0IEBACiAKICAgZm9yIChyYz0wLCBtc2c9bXNnTGlzdC0+Zmlyc3QoKTsgbXNnICYmICFy YzsgbXNnPW1zZ0xpc3QtPm5leHQoKSkKICAgewotICAgIGlmIChkZXN0Rm9sZGVyKSByYyA9IGRl c3RGb2xkZXItPm1vdmVNc2cobXNnKTsKKyAgICBpZiAoZGVzdEZvbGRlcikgeworICAgICAgLy8g ImRlbGV0aW5nIiBtZXNzYWdlcyBtZWFucyBtb3ZpbmcgdGhlbSBpbnRvIHRoZSB0cmFzaCBmb2xk ZXIKKyAgICAgIHJjID0gZGVzdEZvbGRlci0+bW92ZU1zZyhtc2cpOworICAgIH0KICAgICBlbHNl CiAgICAgewotICAgICAgaWYgKCFkb1VwZCkgcmVtb3ZlSXRlbShjdXIpOworICAgICAgLy8gcmVh bGx5IGRlbGV0ZSBtZXNzYWdlcyB0aGF0IGFyZSBhbHJlYWR5IGluIHRoZSB0cmFzaCBmb2xkZXIK KyAgICAgIGlmIChkb1VwZCkgcmVtb3ZlSXRlbShjdXIpOwogICAgICAgbUZvbGRlci0+cmVtb3Zl TXNnKG1zZyk7CiAgICAgICBkZWxldGUgbXNnOwogICAgIH0K --Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD Content-Type: text/plain; name="cancel-filter.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="cancel-filter.diff" LS0tIGttYWlsX29yZy9rbWZpbHRlcmRsZy5jcHAJU2F0IE1heSAgOCAxNjozNjoyOCAxOTk5Cisr KyBrbWFpbC9rbWZpbHRlcmRsZy5jcHAJU2F0IE1heSAgOCAxOTo1OTo1MiAxOTk5CkBAIC01MTEs NyArNTExLDEwIEBACiAvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiB2b2lkIEtNRmlsdGVyRGxnOjpz bG90QnRuT2soKQogewotICBpZiAobUZpbHRlcikgYXBwbHlGaWx0ZXJDaGFuZ2VzKCk7CisgIGlm IChtRmlsdGVyKSB7CisgICAgYXBwbHlGaWx0ZXJDaGFuZ2VzKCk7CisgICAgZmlsdGVyTWdyLT53 cml0ZUNvbmZpZygpOworICB9CiAgIGFjY2VwdCgpOwogfQogCkBAIC01MTksNiArNTIyLDcgQEAK IC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHZvaWQgS01GaWx0ZXJEbGc6OnNsb3RCdG5DYW5jZWwo KQogeworICBmaWx0ZXJNZ3ItPnJlYWRDb25maWcoKTsKICAgcmVqZWN0KCk7CiB9CiAK --Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD Content-Type: text/plain; name="filter-help-button.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="filter-help-button.diff" LS0tIGttYWlsX29yZy9rbWZpbHRlcmRsZy5jcHAJU2F0IE1heSAgOCAxNjozNjoyOCAxOTk5Cisr KyBrbWFpbC9rbWZpbHRlcmRsZy5jcHAJU2F0IE1heSAgOCAxNzozNDowMyAxOTk5CkBAIC01MjYs NiArNTI2LDcgQEAKIC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHZvaWQgS01GaWx0ZXJEbGc6OnNs b3RCdG5IZWxwKCkKIHsKKyAgYXBwLT5pbnZva2VIVE1MSGVscCggYXBwLT5hcHBOYW1lKCkgKyAi LyIgKyAiaW5kZXgtMy5odG1sIiwgInNzMy41IiApOwogfQogCiAK --Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD Content-Type: text/plain; name="sig-append.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="sig-append.diff" LS0tIGttYWlsX29yZy9rbWNvbXBvc2V3aW4uY3BwCVR1ZSBBcHIgMTMgMTQ6MjM6NTUgMTk5OQor Kysga21haWwva21jb21wb3Nld2luLmNwcAlTYXQgTWF5ICA4IDE2OjU4OjA3IDE5OTkKQEAgLTE2 MzIsNyArMTYzMiw3IEBACiAKICAgaWYgKCFzaWdUZXh0LmlzRW1wdHkoKSkKICAgewotICAgIG1F ZGl0b3ItPmluc2VydExpbmUoIi0tIiwgLTEpOworICAgIG1FZGl0b3ItPmluc2VydExpbmUoIi0t ICIsIC0xKTsKICAgICBtRWRpdG9yLT5pbnNlcnRMaW5lKHNpZ1RleHQsIC0xKTsKICAgICBtRWRp dG9yLT50b2dnbGVNb2RpZmllZChtb2QpOwogICB9Cg== --Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD Content-Type: text/plain; name="updown-bugfix.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="updown-bugfix.diff" LS0tIGttYWlsX29yZy9rbWZpbHRlcmRsZy5jcHAJVGh1IEphbiAyMSAyMTo0MTozNyAxOTk5Cisr KyBrbWFpbC9rbWZpbHRlcmRsZy5jcHAJU2F0IE1heSAgOCAwMDoxNToxNyAxOTk5CkBAIC01Myw3 ICs1Myw4IEBACiAgIFFHcmlkTGF5b3V0ICpmZ3JpZCwgKmdyaWQsICphZ3JpZDsKICAgaW50IGgs IHcsIGk7CiAgIFFTaXplIHN6OwotCisgIHVwZG93bl9tb3ZlX3NlbWFwaG9yZSA9IDE7CisgIAog ICBpbml0TWV0YU9iamVjdCgpOwogCiAgIGdyaWQgID0gbmV3IFFHcmlkTGF5b3V0KHRoaXMsIDQs IDIsIDQsIDQpOwpAQCAtMjk2LDcgKzI5Nyw3IEBACiAgIEtNRmlsdGVyQWN0aW9uKiBhY3Rpb247 CiAgIGludCBpOwogCi0gIGlmICghbUZpbHRlcikgcmV0dXJuOworICBpZiAoIW1GaWx0ZXIgfHwg IXVwZG93bl9tb3ZlX3NlbWFwaG9yZSkgcmV0dXJuOwogCiAgIG1GaWx0ZXItPnJ1bGVBKCkuaW5p dChtUnVsZUZpZWxkQS0+Y3VycmVudFRleHQoKSwgCiAJCQkoS01GaWx0ZXJSdWxlOjpGdW5jdGlv biltUnVsZUZ1bmNBLT5jdXJyZW50SXRlbSgpLApAQCAtNDM0LDYgKzQzNSw4IEBACiAKICAgaWYg KGlkeCA8IDEpIHJldHVybjsKIAorICB1cGRvd25fbW92ZV9zZW1hcGhvcmUgPSAwOworCiAgIGZp bHRlciA9IGZpbHRlck1nci0+dGFrZShpZHgpOwogICBhc3NlcnQoZmlsdGVyICE9IE5VTEwpOwog ICBmaWx0ZXJNZ3ItPmluc2VydChpZHgtMSwgZmlsdGVyKTsKQEAgLTQ0Miw2ICs0NDUsOCBAQAog ICBtRmlsdGVyTGlzdC0+aW5zZXJ0SXRlbShmaWx0ZXItPm5hbWUoKSwgaWR4LTEpOwogCiAgIG1G aWx0ZXJMaXN0LT5zZXRDdXJyZW50SXRlbShpZHgtMSk7CisKKyAgdXBkb3duX21vdmVfc2VtYXBo b3JlID0gMTsKIH0KIAogCkBAIC00NTMsNiArNDU4LDggQEAKIAogICBpZiAoaWR4IDwgMCB8fCBp ZHggPj0gKGludCltRmlsdGVyTGlzdC0+Y291bnQoKS0xKSByZXR1cm47CiAKKyAgdXBkb3duX21v dmVfc2VtYXBob3JlID0gMDsKKwogICBmaWx0ZXIgPSBmaWx0ZXJNZ3ItPnRha2UoaWR4KTsKICAg YXNzZXJ0KGZpbHRlciAhPSBOVUxMKTsKICAgZmlsdGVyTWdyLT5pbnNlcnQoaWR4KzEsIGZpbHRl cik7CkBAIC00NjEsNiArNDY4LDggQEAKICAgbUZpbHRlckxpc3QtPmluc2VydEl0ZW0oZmlsdGVy LT5uYW1lKCksIGlkeCsxKTsKIAogICBtRmlsdGVyTGlzdC0+c2V0Q3VycmVudEl0ZW0oaWR4KzEp OworCisgIHVwZG93bl9tb3ZlX3NlbWFwaG9yZSA9IDE7CiB9CiAKIAotLS0ga21haWxfb3JnL2tt ZmlsdGVyZGxnLmgJVGh1IEphbiAyMSAyMTo0MTozOSAxOTk5CisrKyBrbWFpbC9rbWZpbHRlcmRs Zy5oCUZyaSBNYXkgIDcgMjM6NTM6MDUgMTk5OQpAQCAtNzgsNiArNzgsMTAgQEAKICAgUUNvbWJv Qm94ICAgKm1SdWxlRmllbGRBLCAqbVJ1bGVGaWVsZEI7CiAgIFFMaW5lRWRpdCAgICptUnVsZVZh bHVlQSwgKm1SdWxlVmFsdWVCOwogICBRQ29tYm9Cb3ggICAqbVJ1bGVGdW5jQSwgKm1SdWxlRnVu Y0IsICptUnVsZU9wOworCitwcml2YXRlOgorICAvLyB1Z2x5IHdvcmthcm91bmQgYWdhaW5zdCBm aWx0ZXItdXAtZG93bi1tb3ZlIGJ1ZworICBib29sIHVwZG93bl9tb3ZlX3NlbWFwaG9yZTsKIH07 CiAKIAo= --Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD--