------=_Part_32695_12179703.1220194815557 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline > Date: Thu, 21 Aug 2008 22:18:50 -0700 > From: "Ron Goodheart" > Subject: [Kde-pim] [patch] korganizer - printing calendar item > recurrence > To: kde-pim > > HI all, > Got the following on my printout when printing my scheduled event on korganizer. > "Repeat: TODO: Convert Repeat to String!" > > So created the attached patch to print the recurrence information. > > However, have only tested with 3.5 - could not get trunk to compile > due to never finding "AkonadiConfig.cmake". > The patch does support all of the recurrence available on the 3.5 GUI. > > Regards, > Ron > -------------- next part -------------- > A non-text attachment was scrubbed... > Name: calprintdefaultplugins.diff > Type: text/x-patch > Size: 6473 bytes > Desc: not available > Url : http://mail.kde.org/pipermail/kde-pim/attachments/20080821/7dc3a12c/attachment.diff > > ------------------------------ > > Date: Fri, 22 Aug 2008 10:05:25 +0200 (CEST) > From: "Thorsten Staerk" > Subject: Re: [Kde-pim] [patch] korganizer - printing calendar item > recurrence > To: "KDE PIM" > >> HI all, >> Got the following on my printout when printing my scheduled event on >> korganizer. >> "Repeat: TODO: Convert Repeat to String!" >> >> So created the attached patch to print the recurrence information. >> >> However, have only tested with 3.5 - could not get trunk to compile >> due to never finding "AkonadiConfig.cmake". >> The patch does support all of the recurrence available on the 3.5 GUI. >> >> Regards, >> Ron > good stuff! I can port it to KDE trunk, or you can do after you follow > http://techbase.kde.org/Getting_Started/Build/KDE4 and get trunk > compiling. To be short: In order to compile trunk, compile in this order: > kdesupport > KDE/kdelibs > KDE/kdepimlibs > KDE/kdebase > KDE/kdepim > Then the Akonadi problem should be solved. > > regards and go on like this > > Thorsten > Thanks for all the feedback! Another stab at recurrence printing code... I've attached the modified diffs for korganizer printing 3.5 and trunk with corrections and information for the translators. I tried to make abundantly clear the usage of the parameters and moved out singular/plural constructs into i18np() calls. I will be glad to revise if I went overboard on this. Additionally, I did have some difficulty with linking libkorg_stdprinting.so due to including "KOGlobals::self()->calendarSystem();" which was needed for some of the date formatting. This was solved by changing the linking to STATIC (diff attached) - perhaps there is a better way to do this? attached are three diffs: 1) changes to 3.5 - recurrence print code 2) changes to trunk - recurrence print code 3) changes to trunk - static linking of libkorg_stdprinting Regards, Ron ------=_Part_32695_12179703.1220194815557 Content-Type: text/x-patch; name=calprintdefaultplugins-3.5.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_fkjrbkgl3 Content-Disposition: attachment; filename=calprintdefaultplugins-3.5.diff SW5kZXg6IDMuNS9rZGVwaW0va29yZ2FuaXplci9wcmludGluZy9jYWxwcmludGRlZmF1bHRwbHVn aW5zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSAzLjUva2RlcGltL2tvcmdhbml6ZXIvcHJpbnRpbmcvY2Fs cHJpbnRkZWZhdWx0cGx1Z2lucy5jcHAJKHJldmlzaW9uIDg1MDcxMCkKKysrIDMuNS9rZGVwaW0v a29yZ2FuaXplci9wcmludGluZy9jYWxwcmludGRlZmF1bHRwbHVnaW5zLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1ZGUgPGtjYWxlbmRhcnN5c3RlbS5oPgogI2lu Y2x1ZGUgPGtudW1pbnB1dC5oPgogI2luY2x1ZGUgPGtjb21ib2JveC5oPgorI2luY2x1ZGUgPGtv Z2xvYmFscy5oPgogCiAjaW5jbHVkZSAiY2FscHJpbnRkZWZhdWx0cGx1Z2lucy5oIgogCkBAIC0y ODAsMTIgKzI4MSwxNTIgQEAKICAgICAgIGggPSBRTUFYKCBwcmludENhcHRpb25BbmRUZXh0KCBw LCB0ZXh0UmVjdCwgc3RyaW5nVmlzLm1FbmRDYXB0aW9uLCBzdHJpbmdWaXMubUVuZFN0cmluZywg Y2FwdGlvbkZvbnQsIHRleHRGb250ICksIGggKTsKICAgICB9CiAgICAgCi0gICAgCisgICAgLy8g Q29udmVydCByZWN1cnJlbmNlIHRvIGEgc3RyaW5nCiAgICAgaWYgKCAoKml0KS0+ZG9lc1JlY3Vy KCkgKSB7CiAgICAgICBRUmVjdCByZWN1ckJveCggdGltZXNCb3gubGVmdCgpK3BhZGRpbmcoKSwg aCtwYWRkaW5nKCksIHRpbWVzQm94LnJpZ2h0KCktcGFkZGluZygpLCBsaW5lSGVpZ2h0ICk7Ci0g ICAgICAvLyBUT0RPOiBDb252ZXJ0IHRoZSByZWN1cnJlbmNlIHRvIGEgc3RyaW5nIGFuZCBwcmlu dCBpdCBvdXQhCi0gICAgICBRU3RyaW5nIHJlY3VyU3RyaW5nKCAiVE9ETzogQ29udmVydCBSZXBl YXQgdG8gU3RyaW5nISIgKTsKLSAgICAgIGggPSBRTUFYKCBwcmludENhcHRpb25BbmRUZXh0KCBw LCByZWN1ckJveCwgaTE4bigiUmVwZWF0czogIiksIHJlY3VyU3RyaW5nLCBjYXB0aW9uRm9udCwg dGV4dEZvbnQgKSwgaCApOworICAgICAgS0NhbDo6UmVjdXJyZW5jZSAqcmVjdXJzID0gKCppdCkt PnJlY3VycmVuY2UoKTsKKyAgICAgIC8vIHJlY3VycmVuY2UKKyAgICAgIFFTdHJpbmdMaXN0IGRh eUxpc3Q7CisgICAgICBkYXlMaXN0LnB1c2hfYmFjayggaTE4bigiNXRoIExhc3QiKSApOworICAg ICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIjR0aCBMYXN0IikgKTsKKyAgICAgIGRheUxpc3Qu cHVzaF9iYWNrKCBpMThuKCIzcmQgTGFzdCIpICk7CisgICAgICBkYXlMaXN0LnB1c2hfYmFjaygg aTE4bigiMm5kIExhc3QiKSApOworICAgICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIkxhc3Qi KSApOyAKKyAgICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCJ1bmtub3duIikgKTsgLy8gemVy bywgc2hvdWxkIG5vdCBiZSByZWZlcmVuY2VkCisgICAgICBkYXlMaXN0LnB1c2hfYmFjayggaTE4 bigiMXN0IikgKTsKKyAgICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCIybmQiKSApOworICAg ICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIjNyZCIpICk7CisgICAgICBkYXlMaXN0LnB1c2hf YmFjayggaTE4bigiNHRoIikgKTsKKyAgICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCI1dGgi KSApOyAgICAgIAorICAgICAgUVN0cmluZyByZWN1clN0cmluZzsKKyAgICAgIGNvbnN0IEtDYWxl bmRhclN5c3RlbSAqY2FsU3lzID0gS09HbG9iYWxzOjpzZWxmKCktPmNhbGVuZGFyU3lzdGVtKCk7 CisgICAgICBzd2l0Y2gocmVjdXJzLT5yZWN1cnJlbmNlVHlwZSgpKSB7CisgICAgICAgIGNhc2Ug UmVjdXJyZW5jZTo6ck5vbmU6CisgICAgICAgICAgcmVjdXJTdHJpbmcgPSBpMThuKCJOb25lIik7 CisgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgUmVjdXJyZW5jZTo6ckRhaWx5OgorICAg ICAgICAgIHJlY3VyU3RyaW5nID0gaTE4bigiRXZlcnkgJW4gZGF5IiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIkV2ZXJ5ICVuIGRheXMiLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZWN1cnMtPmZyZXF1ZW5jeSgpKTsKKyAgICAgICAgICBicmVhazsKKyAgICAgICAgY2Fz ZSBSZWN1cnJlbmNlOjpyV2Vla2x5OiAKKyAgICAgICAgeworICAgICAgICAgIFFTdHJpbmcgZGF5 TmFtZXM7CisgICAgICAgICAgLy8gUmVzcGVjdCBzdGFydCBvZiB3ZWVrIHNldHRpbmcKKyAgICAg ICAgICBpbnQgd2Vla1N0YXJ0ID0gS0dsb2JhbDo6bG9jYWxlKCktPndlZWtTdGFydERheSgpOwor ICAgICAgICAgIGJvb2wgYWRkU3BhY2UgPSBmYWxzZTsKKyAgICAgICAgICBmb3IgKCBpbnQgaSA9 IDA7IGkgPCA3OyArK2kgKSB7IAorICAgICAgICAgICAgaWYgKCByZWN1cnMtPmRheXMoKS50ZXN0 Qml0KCAoaSt3ZWVrU3RhcnQrNiklNyApKSB7CisgICAgICAgICAgICAgIGlmIChhZGRTcGFjZSkg ZGF5TmFtZXMuYXBwZW5kKCIgIik7ICAKKyAgICAgICAgICAgICAgZGF5TmFtZXMuYXBwZW5kKCBj YWxTeXMtPndlZWtEYXlOYW1lKCAoKGkrd2Vla1N0YXJ0KzYpJTcpKzEsIHRydWUgKSApOworICAg ICAgICAgICAgICBhZGRTcGFjZT10cnVlOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKyAg ICAgICAgICByZWN1clN0cmluZyA9IGkxOG4oIkV2ZXJ5IE5VTUJFUiBXRUVLW1NdIG9uIFdFRUtE QVlOQU1FTElTVCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAoRXZlcnkgNCB3ZWVr cyBvbiBUdWVzIFdlZCBUaHUpIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkV2ZXJ5 ICUxICUyIG9uICUzIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAuYXJnKHJlY3Vycy0+ ZnJlcXVlbmN5KCkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgLmFyZyhpMThuKCJ3ZWVr Iiwid2Vla3MiLHJlY3Vycy0+ZnJlcXVlbmN5KCkpKQorICAgICAgICAgICAgICAJCQkJCQkJLmFy ZyhkYXlOYW1lcyk7CisgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgY2FzZSBS ZWN1cnJlbmNlOjpyTW9udGhseVBvczoKKyAgICAgICAgeworICAgICAgICAgIEtDYWw6OlJlY3Vy cmVuY2VSdWxlOjpXRGF5UG9zIHJ1bGUgPSByZWN1cnMtPm1vbnRoUG9zaXRpb25zKClbMF07Cisg ICAgICAgICAgcmVjdXJTdHJpbmcgPSBpMThuKCJFdmVyeSBOVU1CRVIgTU9OVEhbU10gb24gdGhl IFsybmR8M3JkfC4uLl0gV0VFS0RBWU5BTUUiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICIgKEV2ZXJ5IDIgbW9udGhzIG9uIHRoZSAzcmQgV2VkbmVzZGF5KSIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJFdmVyeSAlMSAlMiBvbiB0aGUgJTMgJTQiKQorICAgICAgICAgICAg ICAJCQkJCQkJLmFyZyhyZWN1cnMtPmZyZXF1ZW5jeSgpKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC5hcmcoaTE4bigibW9udGgiLCJtb250aHMiLHJlY3Vycy0+ZnJlcXVlbmN5KCkpKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC5hcmcoZGF5TGlzdFtydWxlLnBvcygpICsgNV0p CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgLmFyZyhjYWxTeXMtPndlZWtEYXlOYW1lKHJ1 bGUuZGF5KCkpKTsKKyAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBjYXNlIFJl Y3VycmVuY2U6OnJNb250aGx5RGF5OgorICAgICAgICB7ICAgICAKKyAgICAgICAgICBpbnQgZGF5 cyA9IHJlY3Vycy0+bW9udGhEYXlzKClbMF07CisgICAgICAgICAgaWYgKGRheXMgPCAwKSB7Cisg ICAgICAgICAgICByZWN1clN0cmluZyA9IGkxOG4oIkV2ZXJ5IE5VTUJFUiBNT05USFtTXSBvbiB0 aGUgWzJuZHwzcmR8Li4uXSBkYXkiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAo RXZlcnkgNSBtb250aHMgb24gdGhlIDNyZCBkYXkpIiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiRXZlcnkgJTEgJTIgb24gdGhlICUzIGRheSIpCisgICAgICAgICAgICAgIAkJCQkJ CQkgIC5hcmcocmVjdXJzLT5mcmVxdWVuY3koKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC5hcmcoaTE4bigibW9udGgiLCJtb250aHMiLHJlY3Vycy0+ZnJlcXVlbmN5KCkpKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLmFyZyggZGF5TGlzdFtkYXlzICsgNV0gKTsKKyAg ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgcmVjdXJTdHJpbmcgPSBpMThuKCJFdmVyeSBO VU1CRVIgTU9OVEhbU30gb24gZGF5IE5VTUJFUiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiIChFdmVyeSA0IG1vbnRocyBvbiBkYXkgNSkiLAorICAgICAgICAgICAgICAJCQkJCQkJ ICAgIkV2ZXJ5ICUxICUyIG9uIGRheSAlMyIpCisgICAgICAgICAgICAgICAJCQkJCQkJICAuYXJn KHJlY3Vycy0+ZnJlcXVlbmN5KCkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuYXJn KGkxOG4oIm1vbnRoIiwibW9udGhzIixyZWN1cnMtPmZyZXF1ZW5jeSgpKSkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIC5hcmcocmVjdXJzLT5tb250aERheXMoKVswXSk7CisgICAgICAg ICAgfQorICAgICAgICAgIGJyZWFrOworICAgICAgICB9ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgCisKKyAgICAgICAgY2FzZSBSZWN1cnJlbmNlOjpyWWVhcmx5TW9udGg6CisgICAgICAg ICAgcmVjdXJTdHJpbmcgPSBpMThuKCJFdmVyeSBOVU1CRVIgWUVBUltTXSBvbiBkYXkgTlVNQkVS IG9mIE1PTlRITkFNRSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAoRXZlcnkgMiB5 ZWFycyBvbiBkYXkgMTIgb2YgTWFyY2gpIiwKKyAgICAgICAgICAgICAgCQkJCQkJCSAiRXZlcnkg JTEgJTIgb24gZGF5ICUzIG9mICU0IikKKyAgICAgICAgICAgICAgCQkJCQkJCS5hcmcocmVjdXJz LT5mcmVxdWVuY3koKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAuYXJnKGkxOG4oInll YXIiLCJ5ZWFycyIscmVjdXJzLT5mcmVxdWVuY3koKSkpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgLmFyZyhyZWN1cnMtPnllYXJEYXRlcygpWzBdKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC5hcmcoY2FsU3lzLT5tb250aE5hbWUocmVjdXJzLT55ZWFyTW9udGhzKClbMF0sMTk2 MCkpOworICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFJlY3VycmVuY2U6OnJZZWFybHlQ b3M6CisgICAgICAgIHsKKyAgICAgICAgICBLQ2FsOjpSZWN1cnJlbmNlUnVsZTo6V0RheVBvcyBy dWxlID0gcmVjdXJzLT55ZWFyUG9zaXRpb25zKClbMF07CisgICAgICAgICAgcmVjdXJTdHJpbmcg PSBpMThuKCJFdmVyeSBOVU1CRVIgWUVBUltTXSBvbiB0aGUgWzJuZHwzcmR8Li4uXSBXRUVLREFZ TkFNRSBvZiBNT05USE5BTUUiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgKEV2ZXJ5 IDIgeWVhcnMgb24gdGhlIDJuZCBUdWVzZGF5IG9mIE1hcmNoKSIsCisgICAgICAgICAgICAgIAkJ CQkJCQkgIkV2ZXJ5ICUxICUyIG9uIHRoZSAlMyAlNCBvZiAlNSIpCisgICAgICAgICAgICAgIAkJ CQkJCQkuYXJnKHJlY3Vycy0+ZnJlcXVlbmN5KCkpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLmFyZyhpMThuKCJ5ZWFyIiwieWVhcnMiLHJlY3Vycy0+ZnJlcXVlbmN5KCkpKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC5hcmcoIGRheUxpc3RbcnVsZS5wb3MoKSArIDVdICkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAuYXJnKCBjYWxTeXMtPndlZWtEYXlOYW1lKHJ1bGUu ZGF5KCkpICkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAuYXJnKCBjYWxTeXMtPm1vbnRo TmFtZShyZWN1cnMtPnllYXJNb250aHMoKVswXSwxOTYwKSApOworICAgICAgICAgIGJyZWFrOwor ICAgICAgICB9CisgICAgICAgIGNhc2UgUmVjdXJyZW5jZTo6clllYXJseURheToKKyAgICAgICAg ICByZWN1clN0cmluZyA9IGkxOG4oIkV2ZXJ5IE5VTUJFUiBZRUFSW1NdIG9uIGRheSBOVU1CRVIi CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgKEV2ZXJ5IDIgeWVhcnMgb24gZGF5IDEy MikiLAorICAgICAgICAgICAgICAJCQkJCQkJICJFdmVyeSAlMSAlMiBvbiBkYXkgJTMiKQorICAg ICAgICAgICAgICAJCQkJCQkJLmFyZyhyZWN1cnMtPmZyZXF1ZW5jeSgpKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC5hcmcoaTE4bigieWVhciIsInllYXJzIixyZWN1cnMtPmZyZXF1ZW5j eSgpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAuYXJnKCByZWN1cnMtPnllYXJEYXlz KClbMF0gKTsKKyAgICAgICAgICBicmVhazsKKyAgICAgIH0gICAgICAKKyAgICAgIC8vIG9jY3Vy cmVuY2VzCisgICAgICBRU3RyaW5nIG9jY3VyU3RyaW5nOworICAgICAgc3dpdGNoIChyZWN1cnMt PmR1cmF0aW9uKCkpIHsKKyAgICAgICAgY2FzZSAwOiAvLyBlbmQgZGF0ZSBzZXQKKyAgICAgICAg ICBvY2N1clN0cmluZyA9IGkxOG4oInVudGlsIERBVEUiLCAidW50aWwgJTEiKQorCQkJCQkJCS5h cmcoS0dsb2JhbDo6bG9jYWxlKCktPmZvcm1hdERhdGUocmVjdXJzLT5lbmREYXRlKCksdHJ1ZSkp OworICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIC0xOiAvLyBpbmZpbml0ZQorICAgICAg ICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OiAvLyBudW1iZXIgb2Ygb2NjdXJyZW5jZXMKKyAg ICAgICAgICBvY2N1clN0cmluZyA9IGkxOG4oImZvciAlbiBvY2N1cmVuY2UiLCAKKyAgICAgICAg ICAgICAgICAgIAkJCQkJICJmb3IgJW4gb2NjdXJlbmNlcyIsCisgICAgICAgICAgICAgIAkJCQkJ CQkgcmVjdXJzLT5kdXJhdGlvbigpKTsKKyAgICAgICAgICBicmVhazsKKyAgICAgIH0KKyAgICAg IC8vIGV4Y2VwdGlvbiBkYXRlcworICAgICAgUVN0cmluZyBleGNlcHRTdHJpbmc7CisgICAgICBp ZiAoICFyZWN1cnMtPmV4RGF0ZXMoKS5pc0VtcHR5KCkgKSB7CisgICAgICAgIGV4Y2VwdFN0cmlu ZyA9IGkxOG4oImV4Y2x1ZGluZyBEQVRFIERBVEUuLi4iLCAiZXhjZXB0Iik7CisgICAgICAgIGZv ciAoIHVuc2lnbmVkIGkgPSAwOyBpIDwgcmVjdXJzLT5leERhdGVzKCkuc2l6ZSgpOyBpKysgKSB7 CisgICAgICAgICAgZXhjZXB0U3RyaW5nLmFwcGVuZCgiICIpOworICAgICAgICAgIGV4Y2VwdFN0 cmluZy5hcHBlbmQoIEtHbG9iYWw6OmxvY2FsZSgpLT5mb3JtYXREYXRlKCByZWN1cnMtPmV4RGF0 ZXMoKVtpXSx0cnVlKSApOworICAgICAgICB9CisgICAgICB9ICAgICAgCisgICAgICBRU3RyaW5n IGRpc3BsYXlTdHJpbmc7CisgICAgICBkaXNwbGF5U3RyaW5nLmFwcGVuZChyZWN1clN0cmluZyk7 CisgICAgICBpZiAoIWRpc3BsYXlTdHJpbmcuZW5kc1dpdGgoIiAiKSkKKyAgICAgICAgZGlzcGxh eVN0cmluZy5hcHBlbmQoIiAiKTsKKyAgICAgIGRpc3BsYXlTdHJpbmcuYXBwZW5kKG9jY3VyU3Ry aW5nKTsKKyAgICAgIGlmICghZGlzcGxheVN0cmluZy5lbmRzV2l0aCgiICIpKQorICAgICAgICBk aXNwbGF5U3RyaW5nLmFwcGVuZCgiICIpOworICAgICAgZGlzcGxheVN0cmluZy5hcHBlbmQoZXhj ZXB0U3RyaW5nKTsKKyAgICAgIGggPSBRTUFYKCBwcmludENhcHRpb25BbmRUZXh0KCBwLCByZWN1 ckJveCwgaTE4bigiUmVwZWF0czogIiksIGRpc3BsYXlTdHJpbmcsIGNhcHRpb25Gb250LCB0ZXh0 Rm9udCApLCBoICk7CiAgICAgfQogICAgIAogICAgIFFSZWN0IGFsYXJtQm94KCB0aW1lc0JveC5s ZWZ0KCkrcGFkZGluZygpLCBoK3BhZGRpbmcoKSwgdGltZXNCb3gucmlnaHQoKS1wYWRkaW5nKCks IGxpbmVIZWlnaHQgKTsK ------=_Part_32695_12179703.1220194815557 Content-Type: text/x-patch; name=calprintdefaultplugins-trunk.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_fkjryynq2 Content-Disposition: attachment; filename=calprintdefaultplugins-trunk.diff SW5kZXg6IHRydW5rL0tERS9rZGVwaW0va29yZ2FuaXplci9wcmludGluZy9jYWxwcmludGRlZmF1 bHRwbHVnaW5zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0cnVuay9LREUva2RlcGltL2tvcmdhbml6ZXIv cHJpbnRpbmcvY2FscHJpbnRkZWZhdWx0cGx1Z2lucy5jcHAJKHJldmlzaW9uIDg1NDY2OSkKKysr IHRydW5rL0tERS9rZGVwaW0va29yZ2FuaXplci9wcmludGluZy9jYWxwcmludGRlZmF1bHRwbHVn aW5zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQsNyArMzQsNyBAQAogI2luY2x1ZGUgPGtjYWwv dG9kby5oPgogI2luY2x1ZGUgPGtjYWwvY2FsZW5kYXIuaD4KIAotI2luY2x1ZGUgPGtnbG9iYWwu aD4KKyNpbmNsdWRlIDxrb2dsb2JhbHMuaD4KICNpbmNsdWRlIDxrbG9jYWxlLmg+CiAjaW5jbHVk ZSA8a2RlYnVnLmg+CiAjaW5jbHVkZSA8a2NvbmZpZy5oPgpAQCAtNTAsNiArNTAsNyBAQAogI2lu Y2x1ZGUgPFFQcmludGVyPgogI2luY2x1ZGUgPFFXaWRnZXQ+CiAKKwogLyoqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAgKiAgICAg ICAgICAgUHJpbnQgSW5jaWRlbmNlCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCkBAIC0yOTYsMTMgKzI5NywxODEgQEAKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJpbmdWaXMubUVuZFN0cmluZywg Y2FwdGlvbkZvbnQsIHRleHRGb250ICksIGggKTsKICAgICB9CiAKKyAgICAvLyBDb252ZXJ0IHJl Y3VycmVuY2UgdG8gYSBzdHJpbmcKICAgICBpZiAoICgqaXQpLT5yZWN1cnMoKSApIHsKLSAgICAg IFFSZWN0IHJlY3VyQm94KCB0aW1lc0JveC5sZWZ0KCkgKyBwYWRkaW5nKCksIGggKyBwYWRkaW5n KCksCi0gICAgICAgICAgICAgICAgICAgICAgdGltZXNCb3gucmlnaHQoKSAtIHBhZGRpbmcoKSwg bGluZUhlaWdodCApOwotICAgICAgLy8gVE9ETzogQ29udmVydCB0aGUgcmVjdXJyZW5jZSB0byBh IHN0cmluZyBhbmQgcHJpbnQgaXQgb3V0IQotICAgICAgUVN0cmluZyByZWN1clN0cmluZyggIlRP RE86IENvbnZlcnQgUmVwZWF0IHRvIFN0cmluZyEiICk7Ci0gICAgICBoID0gcU1heCggcHJpbnRD YXB0aW9uQW5kVGV4dCggcCwgcmVjdXJCb3gsIGkxOG4oICJSZXBlYXRzOiAiICksCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVjdXJTdHJpbmcsIGNhcHRpb25Gb250LCB0 ZXh0Rm9udCApLCBoICk7CisgICAgICBRUmVjdCByZWN1ckJveCggdGltZXNCb3gubGVmdCgpK3Bh ZGRpbmcoKSwgaCtwYWRkaW5nKCksIHRpbWVzQm94LnJpZ2h0KCktcGFkZGluZygpLCBsaW5lSGVp Z2h0ICk7CisgICAgICBLQ2FsOjpSZWN1cnJlbmNlICpyZWN1cnMgPSAoKml0KS0+cmVjdXJyZW5j ZSgpOworICAgICAgLy8gcmVjdXJyZW5jZQorICAgICAgUVN0cmluZ0xpc3QgZGF5TGlzdDsKKyAg ICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCIzMXN0IExhc3QiKSApOworICAgICAgZGF5TGlz dC5wdXNoX2JhY2soIGkxOG4oIjMwdGggTGFzdCIpICk7CisgICAgICBkYXlMaXN0LnB1c2hfYmFj ayggaTE4bigiMjl0aCBMYXN0IikgKTsKKyAgICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCIy OHRoIExhc3QiKSApOworICAgICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIjI3dGggTGFzdCIp ICk7CisgICAgICBkYXlMaXN0LnB1c2hfYmFjayggaTE4bigiMjZ0aCBMYXN0IikgKTsKKyAgICAg IGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCIyNXRoIExhc3QiKSApOworICAgICAgZGF5TGlzdC5w dXNoX2JhY2soIGkxOG4oIjI0dGggTGFzdCIpICk7CisgICAgICBkYXlMaXN0LnB1c2hfYmFjaygg aTE4bigiMjNyZCBMYXN0IikgKTsKKyAgICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCIyMm5k IExhc3QiKSApOworICAgICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIjIxc3QgTGFzdCIpICk7 CisgICAgICBkYXlMaXN0LnB1c2hfYmFjayggaTE4bigiMjB0aCBMYXN0IikgKTsKKyAgICAgIGRh eUxpc3QucHVzaF9iYWNrKCBpMThuKCIxOXRoIExhc3QiKSApOworICAgICAgZGF5TGlzdC5wdXNo X2JhY2soIGkxOG4oIjE4dGggTGFzdCIpICk7CisgICAgICBkYXlMaXN0LnB1c2hfYmFjayggaTE4 bigiMTd0aCBMYXN0IikgKTsKKyAgICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCIxNnRoIExh c3QiKSApOworICAgICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIjE1dGggTGFzdCIpICk7Cisg ICAgICBkYXlMaXN0LnB1c2hfYmFjayggaTE4bigiMTR0aCBMYXN0IikgKTsKKyAgICAgIGRheUxp c3QucHVzaF9iYWNrKCBpMThuKCIxM3RoIExhc3QiKSApOworICAgICAgZGF5TGlzdC5wdXNoX2Jh Y2soIGkxOG4oIjEydGggTGFzdCIpICk7CisgICAgICBkYXlMaXN0LnB1c2hfYmFjayggaTE4bigi MTF0aCBMYXN0IikgKTsKKyAgICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCIxMHRoIExhc3Qi KSApOworICAgICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIjl0aCBMYXN0IikgKTsKKyAgICAg IGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCI4dGggTGFzdCIpICk7CisgICAgICBkYXlMaXN0LnB1 c2hfYmFjayggaTE4bigiN3RoIExhc3QiKSApOworICAgICAgZGF5TGlzdC5wdXNoX2JhY2soIGkx OG4oIjZ0aCBMYXN0IikgKTsKKyAgICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThuKCI1dGggTGFz dCIpICk7CisgICAgICBkYXlMaXN0LnB1c2hfYmFjayggaTE4bigiNHRoIExhc3QiKSApOworICAg ICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIjNyZCBMYXN0IikgKTsKKyAgICAgIGRheUxpc3Qu cHVzaF9iYWNrKCBpMThuKCIybmQgTGFzdCIpICk7CisgICAgICBkYXlMaXN0LnB1c2hfYmFjaygg aTE4bigiTGFzdCIpICk7IAorICAgICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oInVua25vd24i KSApOyAvLyMzMSAtIHplcm8gb2Zmc2V0IGZyb20gVUksIHNob3VsZCBub3QgYmUgcmVmZXJlbmNl ZAorICAgICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIjFzdCIpICk7CisgICAgICBkYXlMaXN0 LnB1c2hfYmFjayggaTE4bigiMm5kIikgKTsKKyAgICAgIGRheUxpc3QucHVzaF9iYWNrKCBpMThu KCIzcmQiKSApOworICAgICAgZGF5TGlzdC5wdXNoX2JhY2soIGkxOG4oIjR0aCIpICk7CisgICAg ICBkYXlMaXN0LnB1c2hfYmFjayggaTE4bigiNXRoIikgKTsgICAgICAKKyAgICAgIFFTdHJpbmcg cmVjdXJTdHJpbmc7CisgICAgICBjb25zdCBLQ2FsZW5kYXJTeXN0ZW0gKmNhbFN5cyA9IEtPR2xv YmFsczo6c2VsZigpLT5jYWxlbmRhclN5c3RlbSgpOworICAgICAgc3dpdGNoKHJlY3Vycy0+cmVj dXJyZW5jZVR5cGUoKSkgeworICAgICAgICBjYXNlIFJlY3VycmVuY2U6OnJOb25lOgorICAgICAg ICAgIHJlY3VyU3RyaW5nID0gaTE4bigiTm9uZSIpOworICAgICAgICAgIGJyZWFrOworICAgICAg ICBjYXNlIFJlY3VycmVuY2U6OnJEYWlseToKKyAgICAgICAgICByZWN1clN0cmluZyA9IGkxOG5w KCJFdmVyeSAlMSBkYXkiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkV2ZXJ5ICUx IGRheXMiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVjdXJzLT5mcmVxdWVuY3ko KSk7CisgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgUmVjdXJyZW5jZTo6cldlZWtseTog CisgICAgICAgIHsKKyAgICAgICAgICBRU3RyaW5nIGRheU5hbWVzOworICAgICAgICAgIC8vIFJl c3BlY3Qgc3RhcnQgb2Ygd2VlayBzZXR0aW5nCisgICAgICAgICAgaW50IHdlZWtTdGFydCA9IEtH bG9iYWw6OmxvY2FsZSgpLT53ZWVrU3RhcnREYXkoKTsKKyAgICAgICAgICBib29sIGFkZFNwYWNl ID0gZmFsc2U7CisgICAgICAgICAgZm9yICggaW50IGkgPSAwOyBpIDwgNzsgKytpICkgeyAKKyAg ICAgICAgICAgIGlmICggcmVjdXJzLT5kYXlzKCkudGVzdEJpdCggKGkrd2Vla1N0YXJ0KzYpJTcg KSkgeworICAgICAgICAgICAgICBpZiAoYWRkU3BhY2UpIGRheU5hbWVzLmFwcGVuZCgiICIpOyAg CisgICAgICAgICAgICAgIGRheU5hbWVzLmFwcGVuZCggY2FsU3lzLT53ZWVrRGF5TmFtZSggKChp K3dlZWtTdGFydCs2KSU3KSsxLCBLQ2FsZW5kYXJTeXN0ZW06OlNob3J0RGF5TmFtZSApICk7Cisg ICAgICAgICAgICAgIGFkZFNwYWNlPXRydWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSAK KyAgICAgICAgICByZWN1clN0cmluZyA9IGkxOG5jKCJFdmVyeSBOIFdFRUtbU10gb24gV0VFS0RB WU5BTUVMSVNUIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAoRXZlcnkgNCB3ZWVr cyBvbiBUdWVzIFdlZCBUaHUpIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJFdmVy eSA8bnVtaWQ+JTE8L251bWlkPiAlMiBvbiAlMyIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZWN1cnMtPmZyZXF1ZW5jeSgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aTE4bnAoIndlZWsiLCJ3ZWVrcyIscmVjdXJzLT5mcmVxdWVuY3koKSksCisJCQkJCQkJICAgICAg ICAgICAgICAgIGRheU5hbWVzICk7CisgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAg ICAgY2FzZSBSZWN1cnJlbmNlOjpyTW9udGhseVBvczoKKyAgICAgICAgeworICAgICAgICAgIEtD YWw6OlJlY3VycmVuY2VSdWxlOjpXRGF5UG9zIHJ1bGUgPSByZWN1cnMtPm1vbnRoUG9zaXRpb25z KClbMF07CisgICAgICAgICAgcmVjdXJTdHJpbmcgPSBpMThuYygiRXZlcnkgTiBNT05USFtTXSBv biB0aGUgWzJuZHwzcmR8Li4uXSBXRUVLREFZTkFNRSIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICIgKEV2ZXJ5IDIgbW9udGhzIG9uIHRoZSAzcmQgV2VkbmVzZGF5KSIsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiRXZlcnkgPG51bWlkPiUxPC9udW1pZD4gJTIgb24gdGhl ICUzICU0IiwKKyAgCQkJCQkgICAgICAgICAgICAJCSAgcmVjdXJzLT5mcmVxdWVuY3koKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGkxOG5wKCJtb250aCIsIm1vbnRocyIscmVjdXJz LT5mcmVxdWVuY3koKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXlMaXN0W3J1 bGUucG9zKCkgKyAzMV0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYWxTeXMtPndl ZWtEYXlOYW1lKHJ1bGUuZGF5KCksS0NhbGVuZGFyU3lzdGVtOjpMb25nRGF5TmFtZSkgKTsKKyAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBjYXNlIFJlY3VycmVuY2U6OnJNb250 aGx5RGF5OgorICAgICAgICB7ICAgICAKKyAgICAgICAgICBpbnQgZGF5cyA9IHJlY3Vycy0+bW9u dGhEYXlzKClbMF07CisgICAgICAgICAgaWYgKGRheXMgPCAwKSB7CisgICAgICAgICAgICByZWN1 clN0cmluZyA9IGkxOG5jKCJFdmVyeSBOIE1PTlRIW1NdIG9uIHRoZSBbMm5kfDNyZHwuLi5dIGRh eSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAoRXZlcnkgNSBtb250aHMgb24g dGhlIDNyZCBkYXkpIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkV2ZXJ5IDxu dW1pZD4lMTxuaXVtaWQ+ICUyIG9uIHRoZSAlMyBkYXkiLAorICAJCQkJCSAgICAgICAgICAgIAkJ ICAgIHJlY3Vycy0+ZnJlcXVlbmN5KCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGkxOG5wKCJtb250aCIsIm1vbnRocyIscmVjdXJzLT5mcmVxdWVuY3koKSksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGRheUxpc3RbZGF5cyArIDMxXSApOworICAgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgICByZWN1clN0cmluZyA9IGkxOG5jKCJFdmVyeSBOIE1PTlRIW1N9 IG9uIGRheSBOIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiIChFdmVyeSA0IG1v bnRocyBvbiBkYXkgNSkiLAorCQkgICAgICAgICAgICAgIAkJCQkJICAgICJFdmVyeSA8bnVtaWQ+ JTE8L251bWlkPiAlMiBvbiBkYXkgPG51bWlkPiUzPC9udW1pZD4iLAorICAgCSAgICAgICAgICAg IAkJCQkJCSAgICByZWN1cnMtPmZyZXF1ZW5jeSgpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpMThucCgibW9udGgiLCJtb250aHMiLHJlY3Vycy0+ZnJlcXVlbmN5KCkpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWN1cnMtPm1vbnRoRGF5cygpWzBdICk7Cisg ICAgICAgICAgfQorICAgICAgICAgIGJyZWFrOworICAgICAgICB9ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgCisKKyAgICAgICAgY2FzZSBSZWN1cnJlbmNlOjpyWWVhcmx5TW9udGg6Cisg ICAgICAgICAgcmVjdXJTdHJpbmcgPSBpMThuYygiRXZlcnkgTiBZRUFSW1NdIG9uIGRheSBOIG9m IE1PTlRITkFNRSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgKEV2ZXJ5IDIgeWVh cnMgb24gZGF5IDEyIG9mIE1hcmNoKSIsCisJCQkJCQkgICAgICAgICAgICAgIAkgICJFdmVyeSA8 bnVtaWQ+JTE8L251bWlkPiAlMiBvbiBkYXkgPG51bWlkPiUzPC9udW1pZD4gb2YgJTQiLAorICAJ CQkJICAgICAgICAgICAgCQkJICByZWN1cnMtPmZyZXF1ZW5jeSgpLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaTE4bnAoInllYXIiLCJ5ZWFycyIscmVjdXJzLT5mcmVxdWVuY3koKSks CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWN1cnMtPnllYXJEYXRlcygpWzBdLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FsU3lzLT5tb250aE5hbWUocmVjdXJzLT55 ZWFyTW9udGhzKClbMF0sMTk2MCkgKTsKKyAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBS ZWN1cnJlbmNlOjpyWWVhcmx5UG9zOgorICAgICAgICB7CisgICAgICAgICAgS0NhbDo6UmVjdXJy ZW5jZVJ1bGU6OldEYXlQb3MgcnVsZSA9IHJlY3Vycy0+eWVhclBvc2l0aW9ucygpWzBdOworICAg ICAgICAgIHJlY3VyU3RyaW5nID0gaTE4bmMoIkV2ZXJ5IE4gWUVBUltTXSBvbiB0aGUgWzJuZHwz cmR8Li4uXSBXRUVLREFZTkFNRSBvZiBNT05USE5BTUUiCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiIChFdmVyeSAyIHllYXJzIG9uIHRoZSAybmQgVHVlc2RheSBvZiBNYXJjaCkiLAor CQkJCQkJICAgICAgICAgICAgICAJICAiRXZlcnkgPG51bWlkPiUxPC9udW1pZD4gJTIgb24gdGhl ICUzICU0IG9mICU1IiwKKyAgCQkJCQkJICAgICAgICAgICAgCSAgcmVjdXJzLT5mcmVxdWVuY3ko KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGkxOG5wKCJ5ZWFyIiwieWVhcnMiLHJl Y3Vycy0+ZnJlcXVlbmN5KCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF5TGlz dFtydWxlLnBvcygpICsgMzFdLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FsU3lz LT53ZWVrRGF5TmFtZShydWxlLmRheSgpLCBLQ2FsZW5kYXJTeXN0ZW06OkxvbmdEYXlOYW1lKSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNhbFN5cy0+bW9udGhOYW1lKHJlY3Vycy0+ eWVhck1vbnRocygpWzBdLDE5NjApICk7CisgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAg ICAgICAgY2FzZSBSZWN1cnJlbmNlOjpyWWVhcmx5RGF5OgorICAgICAgICAgIHJlY3VyU3RyaW5n ID0gaTE4bmMoIkV2ZXJ5IE4gWUVBUltTXSBvbiBkYXkgTiIKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICIgKEV2ZXJ5IDIgeWVhcnMgb24gZGF5IDEyMikiLAorCQkJCQkJCSAgICAgICAg ICAgICAgICAiRXZlcnkgPG51bWlkPiUxPC9udW1pZD4gJTIgb24gZGF5IDxudW1pZD4lMzwvbnVt aWQ+IiwKKyAgCQkJCSAgICAgICAgICAgIAkJCSAgcmVjdXJzLT5mcmVxdWVuY3koKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGkxOG5wKCJ5ZWFyIiwieWVhcnMiLHJlY3Vycy0+ZnJl cXVlbmN5KCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVjdXJzLT55ZWFyRGF5 cygpWzBdICk7CisgICAgICAgICAgYnJlYWs7CisgICAgICB9ICAgICAgCisgICAgICAvLyBvY2N1 cnJlbmNlcworICAgICAgUVN0cmluZyBvY2N1clN0cmluZzsKKyAgICAgIHN3aXRjaCAocmVjdXJz LT5kdXJhdGlvbigpKSB7CisgICAgICAgIGNhc2UgMDogLy8gZW5kIGRhdGUgc2V0CisgICAgICAg ICAgb2NjdXJTdHJpbmcgPSBpMThuYygidW50aWwgREFURSIsICJ1bnRpbCAlMSIsCisJCQkJCQkJ ICAgICAgICAgICAgICAgIEtHbG9iYWw6OmxvY2FsZSgpLT5mb3JtYXREYXRlKHJlY3Vycy0+ZW5k RGF0ZSgpLCAKKwkJCQkJCQkgICAgICAgICAgICAgICAgS0xvY2FsZTo6U2hvcnREYXRlKSApOwor ICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIC0xOiAvLyBpbmZpbml0ZQorICAgICAgICAg IGJyZWFrOworICAgICAgICBkZWZhdWx0OiAvLyBudW1iZXIgb2Ygb2NjdXJyZW5jZXMKKyAgICAg ICAgICBvY2N1clN0cmluZyA9IGkxOG5jKCJmb3IgTiAlT0NDVVJFTkNFW1NdIiwgCisgICAgICAg ICAgCQkJCQkgICAgICAgICAgImZvciA8bnVtaWQ+JTE8L251bWlkPiAlMiIsCisJCQkJCQkgICAg ICAgICAgICAgIAkgIHJlY3Vycy0+ZHVyYXRpb24oKSwKKwkJCQkJCSAgICAgICAgICAgICAgCSAg aTE4bnAoIm9jY3VyZW5jZSIsICJvY2N1cmVuY2VzIiwgcmVjdXJzLT5kdXJhdGlvbigpKSApOwor ICAgICAgICAgIGJyZWFrOworICAgICAgfQorICAgICAgLy8gZXhjZXB0aW9uIGRhdGVzCisgICAg ICBRU3RyaW5nIGV4Y2VwdFN0cmluZzsKKyAgICAgIGlmICggIXJlY3Vycy0+ZXhEYXRlcygpLmlz RW1wdHkoKSApIHsKKyAgICAgICAgZXhjZXB0U3RyaW5nID0gaTE4bmMoImV4Y2VwdCBmb3IgbGlz dGVkIGRhdGVzIiwgImV4Y2VwdCIpOworICAgICAgICBmb3IgKCBpbnQgaSA9IDA7IGkgPCByZWN1 cnMtPmV4RGF0ZXMoKS5zaXplKCk7IGkrKyApIHsKKyAgICAgICAgICBleGNlcHRTdHJpbmcuYXBw ZW5kKCIgIik7CisgICAgICAgICAgZXhjZXB0U3RyaW5nLmFwcGVuZCggS0dsb2JhbDo6bG9jYWxl KCktPmZvcm1hdERhdGUocmVjdXJzLT5leERhdGVzKClbaV0sIAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEtMb2NhbGU6OlNob3J0RGF0ZSkgKTsKKyAgICAgICAgfQorICAgICAgfSAg ICAgIAorICAgICAgUVN0cmluZyBkaXNwbGF5U3RyaW5nOworICAgICAgZGlzcGxheVN0cmluZy5h cHBlbmQocmVjdXJTdHJpbmcpOworICAgICAgaWYgKCFkaXNwbGF5U3RyaW5nLmVuZHNXaXRoKCIg IikpCisgICAgICAgIGRpc3BsYXlTdHJpbmcuYXBwZW5kKCIgIik7CisgICAgICBkaXNwbGF5U3Ry aW5nLmFwcGVuZChvY2N1clN0cmluZyk7CisgICAgICBpZiAoIWRpc3BsYXlTdHJpbmcuZW5kc1dp dGgoIiAiKSkKKyAgICAgICAgZGlzcGxheVN0cmluZy5hcHBlbmQoIiAiKTsKKyAgICAgIGRpc3Bs YXlTdHJpbmcuYXBwZW5kKGV4Y2VwdFN0cmluZyk7CisgICAgICBoID0gUU1BWCggcHJpbnRDYXB0 aW9uQW5kVGV4dCggcCwgcmVjdXJCb3gsIGkxOG4oIlJlcGVhdHM6ICIpLCBkaXNwbGF5U3RyaW5n LCBjYXB0aW9uRm9udCwgdGV4dEZvbnQgKSwgaCApOwogICAgIH0KIAogICAgIFFSZWN0IGFsYXJt Qm94KCB0aW1lc0JveC5sZWZ0KCkgKyBwYWRkaW5nKCksIGggKyBwYWRkaW5nKCksCg== ------=_Part_32695_12179703.1220194815557 Content-Type: text/x-patch; name=printing-CMakeLists-trunk.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_fkjrzem73 Content-Disposition: attachment; filename=printing-CMakeLists-trunk.diff SW5kZXg6IHRydW5rL0tERS9rZGVwaW0va29yZ2FuaXplci9wcmludGluZy9DTWFrZUxpc3RzLnR4 dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSB0cnVuay9LREUva2RlcGltL2tvcmdhbml6ZXIvcHJpbnRpbmcvQ01h a2VMaXN0cy50eHQJKHJldmlzaW9uIDg1NDY2OSkKKysrIHRydW5rL0tERS9rZGVwaW0va29yZ2Fu aXplci9wcmludGluZy9DTWFrZUxpc3RzLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMzEsNyArMzEs NyBAQAogICAgY2FscHJpbnR0b2RvY29uZmlnX2Jhc2UudWkgCiAgICBjYWxwcmludHdlZWtjb25m aWdfYmFzZS51aSApCiAKLWtkZTRfYWRkX2xpYnJhcnkoa29yZ19zdGRwcmludGluZyBTSEFSRUQg JHtrb3JnX3N0ZHByaW50aW5nX0xJQl9TUkNTfSkKK2tkZTRfYWRkX2xpYnJhcnkoa29yZ19zdGRw cmludGluZyBTVEFUSUMgJHtrb3JnX3N0ZHByaW50aW5nX0xJQl9TUkNTfSkKIAogdGFyZ2V0X2xp bmtfbGlicmFyaWVzKGtvcmdfc3RkcHJpbnRpbmcgJHtLREU0X0tVVElMU19MSUJTfSBrb2NvcmVo ZWxwZXIga2RlcGltICR7S0RFNF9LQ0FMX0xJQlN9ICR7UVRfUVQzU1VQUE9SVF9MSUJSQVJZfSkK IAo= ------=_Part_32695_12179703.1220194815557 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ KDE PIM mailing list kde-pim@kde.org https://mail.kde.org/mailman/listinfo/kde-pim KDE PIM home page at http://pim.kde.org/ ------=_Part_32695_12179703.1220194815557--