This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. ---1463782655-1168542593-990818821=:2838 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII Content-ID: The attached patch adds to karm a runtime-configurable option to to enable logging of times. The following events are logged: * starting of a task * stoping of a task * changing of the timevalues The format of the logfile is XML except for a missing single root. The resulting logfile should be easily and automaticaly transformable/manageable/exportable into anyones favoured tool for billing, accounting of work hours etc. Comment: This is the first time I'm coding KDE and Qt source and the first in a few years to code C++ again, so please be generous with possible code-impurities of mine ;-) I'd be happy to see the code included with karm. If this is not the right place to post the patch to, I kindly ask to be pointed to the right place. Thanks, *t ----------------------------------------------------------------------- Tomas Pospisek sourcepole - Linux & Open Source Solutions http://sourcepole.com Elestastrasse 18, 7310 Bad Ragaz, Switzerland Tel:+41 (81) 330 77 13, Fax:+41 (81) 330 77 12 ------------------------------------------------------------------------ ---1463782655-1168542593-990818821=:2838 Content-Type: TEXT/PLAIN; CHARSET=iso-8859-1; NAME="karm.diff" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: ATTACHMENT; FILENAME="karm.diff" ZGlmZiAtYiAtQiAtdSAtTiAtUCAtciBrYXJtL2xvZ2luZy5jcHAga2FybS50 cG8vbG9naW5nLmNwcA0KLS0tIGthcm0vbG9naW5nLmNwcAlUaHUgSmFuICAx IDAxOjAwOjAwIDE5NzANCisrKyBrYXJtLnRwby9sb2dpbmcuY3BwCUZyaSBN YXkgMjUgMjA6NTk6MTggMjAwMQ0KQEAgLTAsMCArMSwxMjAgQEANCisjaW5j bHVkZSAibG9naW5nLmgiDQorI2luY2x1ZGUgInRhc2suaCINCisjaW5jbHVk ZSAicHJlZmVyZW5jZXMuaCINCisjaW5jbHVkZSA8cWRhdGV0aW1lLmg+DQor I2luY2x1ZGUgPHFzdHJpbmcuaD4NCisjaW5jbHVkZSA8cWZpbGUuaD4NCisj aW5jbHVkZSA8cXRleHRzdHJlYW0uaD4NCisjaW5jbHVkZSA8cXJlZ2V4cC5o Pg0KKyNpbmNsdWRlIDxpb3N0cmVhbT4NCisNCisjZGVmaW5lIExPR19TVEFS VAkJCQkxDQorI2RlZmluZSBMT0dfU1RPUAkJCQkyDQorI2RlZmluZSBMT0df TkVXX1RPVEFMX1RJTUUJCTMNCisjZGVmaW5lIExPR19ORVdfU0VTU0lPTl9U SU1FCTQNCisNCitMb2dpbmcgKkxvZ2luZzo6X2luc3RhbmNlID0gMDsNCisN CitMb2dpbmc6OkxvZ2luZygpDQorew0KKwlfcHJlZmVyZW5jZXMgPSBQcmVm ZXJlbmNlczo6aW5zdGFuY2UoKTsNCit9DQorDQordm9pZCBMb2dpbmc6OnN0 YXJ0KCBUYXNrICogdGFzaykNCit7DQorCWxvZyh0YXNrLCBMT0dfU1RBUlQp Ow0KK30NCisNCit2b2lkIExvZ2luZzo6c3RvcCggVGFzayAqIHRhc2spDQor ew0KKwlsb2codGFzaywgTE9HX1NUT1ApOw0KK30NCisNCisvLyB3aGVuIHRp bWUgaXMgcmVzZXQuLi4NCit2b2lkIExvZ2luZzo6bmV3VG90YWxUaW1lKCBU YXNrICogdGFzaywgbG9uZyBtaW51dGVzKQ0KK3sNCisJbG9nKHRhc2ssIExP R19ORVdfVE9UQUxfVElNRSwgbWludXRlcyk7DQorfQ0KK3ZvaWQgTG9naW5n OjpuZXdTZXNzaW9uVGltZSggVGFzayAqIHRhc2ssIGxvbmcgbWludXRlcykN Cit7DQorCWxvZyh0YXNrLCBMT0dfTkVXX1NFU1NJT05fVElNRSwgbWludXRl cyk7DQorfQ0KKw0KK3ZvaWQgTG9naW5nOjpsb2coIFRhc2sgKiB0YXNrLCBz aG9ydCB0eXBlLCBsb25nIG1pbnV0ZXMpDQorew0KKw0KKwlpZihfcHJlZmVy ZW5jZXMtPnRpbWVMb2dpbmcoKSkgew0KKwkJUUZpbGUgZihfcHJlZmVyZW5j ZXMtPnRpbWVMb2coKSk7DQorDQorCQlpZiAoIGYub3BlbiggSU9fV3JpdGVP bmx5IHwgSU9fQXBwZW5kKSApIHsNCisJCQlRVGV4dFN0cmVhbSBvdXQoICZm ICk7ICAgICAgICAvLyB1c2UgYSB0ZXh0IHN0cmVhbQ0KKw0KKwkJCWlmKCB0 eXBlID09IExPR19TVEFSVCkgew0KKwkJCQlvdXQgPDwgIjxzdGFydGluZyAg ICAgICAgICI7DQorCQkJfSBlbHNlIGlmKCB0eXBlID09IExPR19TVE9QICkg ew0KKwkJCQlvdXQgPDwgIjxzdG9wcGluZyAgICAgICAgICI7DQorCQkJfSBl bHNlIGlmKCB0eXBlID09IExPR19ORVdfVE9UQUxfVElNRSkgew0KKwkJCQlv dXQgPDwgIjxuZXdfdG90YWxfdGltZSAgICI7DQorCQkJfSBlbHNlIGlmKCB0 eXBlID09IExPR19ORVdfU0VTU0lPTl9USU1FKSB7DQorCQkJCW91dCA8PCAi PG5ld19zZXNzaW9uX3RpbWUgIjsNCisJCQl9IGVsc2Ugew0KKwkJCQljZXJy IDw8ICJQcm9ncmFtbWluZyBlcnJvciEiOw0KKwkJCX0NCisNCisJCQlvdXQg PDwgInRhc2s9XCIiIDw8IGNvbnN0cnVjdFRhc2tOYW1lKHRhc2spIDw8ICJc IiAiDQorCQkJICAgIDw8ICJkYXRlPVwiIiA8PCBRRGF0ZVRpbWU6OmN1cnJl bnREYXRlVGltZSgpLnRvU3RyaW5nKCkgPDwgIlwiICI7DQorCQkJICANCisJ CQlpZiAoIHR5cGUgPT0gTE9HX05FV19UT1RBTF9USU1FIHx8IHR5cGUgPT0g TE9HX05FV19TRVNTSU9OX1RJTUUpIHsNCisJCQkJb3V0IDw8ICJuZXdfdG90 YWw9XCIiIDw8IG1pbnV0ZXMgIDw8ICJcIiAiOw0KKwkJCX0NCisJCQkNCisJ CQlvdXQgPDwgIi8+XG4iOw0KKw0KKwkJCWYuY2xvc2UoKTsNCisJCX0gZWxz ZSB7DQorCQkJY2VyciA8PCAiQ291bGRuJ3Qgd3JpdGUgdG8gdGltZS1sb2cg ZmlsZSI7DQorCQl9DQorCX0NCit9DQorDQorTG9naW5nICpMb2dpbmc6Omlu c3RhbmNlKCkNCit7DQorICBpZiAoX2luc3RhbmNlID09IDApIHsNCisgICAg X2luc3RhbmNlID0gbmV3IExvZ2luZygpOw0KKyAgfQ0KKyAgcmV0dXJuIF9p bnN0YW5jZTsNCit9DQorDQorUVN0cmluZyBMb2dpbmc6OmNvbnN0cnVjdFRh c2tOYW1lKFRhc2sgKnRhc2spDQorew0KKwlRTGlzdFZpZXdJdGVtICppdGVt ID0gdGFzazsNCisJDQorCVFTdHJpbmcgbmFtZSA9IGVzY2FwZVhNTCh0YXNr LT5uYW1lKCkpOw0KKwkNCisJd2hpbGUoaXRlbSA9IGl0ZW0tPnBhcmVudCgp KQ0KKwl7DQorCQluYW1lID0gZXNjYXBlWE1MKCgoVGFzayAqKWl0ZW0pLT5u YW1lKCkpICsgbmFtZS5wcmVwZW5kKCcvJyk7DQorCX0NCisNCisJcmV0dXJu IG5hbWU7DQorfQ0KKw0KKy8vIHdoeSB0aGUgaGVsbCBkbyBJIG5lZWQgdG8g ZG8gdGhpcz8hPw0KKyNkZWZpbmUgUVMoYykgUVN0cmluZzo6ZnJvbUxhdGlu MShjKQ0KKw0KK1FTdHJpbmcgTG9naW5nOjplc2NhcGVYTUwoIFFTdHJpbmcg c3RyaW5nKQ0KK3sNCisJUVN0cmluZyByZXN1bHQgPSBRU3RyaW5nKHN0cmlu Zyk7DQorCXJlc3VsdC5yZXBsYWNlKCBRUmVnRXhwKFFTKCImIikpLCAgUVMo IiZhbXA7IikgICk7DQorCXJlc3VsdC5yZXBsYWNlKCBRUmVnRXhwKFFTKCI8 IikpLCAgUVMoIiZsdDsiKSAgICk7DQorCXJlc3VsdC5yZXBsYWNlKCBRUmVn RXhwKFFTKCI+IikpLCAgUVMoIiZndDsiKSAgICk7DQorCXJlc3VsdC5yZXBs YWNlKCBRUmVnRXhwKFFTKCInIikpLCAgUVMoIiZhcG9zOyIpICk7DQorCXJl c3VsdC5yZXBsYWNlKCBRUmVnRXhwKFFTKCJcIiIpKSwgUVMoIiZxdW90OyIp ICk7DQorCS8vIHByb3RlY3QgYWxzbyBvdXIgdGFzay1zZXBhcmF0b3INCisJ cmVzdWx0LnJlcGxhY2UoIFFSZWdFeHAoUVMoIi8iKSksICBRUygiJnNsYXNo OyIpICk7DQorDQorCXJldHVybiByZXN1bHQ7DQorfQ0KKw0KK0xvZ2luZzo6 fkxvZ2luZygpIHsNCit9DQpkaWZmIC1iIC1CIC11IC1OIC1QIC1yIGthcm0v bG9naW5nLmgga2FybS50cG8vbG9naW5nLmgNCi0tLSBrYXJtL2xvZ2luZy5o CVRodSBKYW4gIDEgMDE6MDA6MDAgMTk3MA0KKysrIGthcm0udHBvL2xvZ2lu Zy5oCUZyaSBNYXkgMjUgMTk6MTA6MjcgMjAwMQ0KQEAgLTAsMCArMSwzMiBA QA0KKyNpZm5kZWYgX0xPR0lOR19IXw0KKyNkZWZpbmUgX0xPR0lOR19IXw0K Kw0KKyNpbmNsdWRlICJwcmVmZXJlbmNlcy5oIg0KKyNpbmNsdWRlIDxxc3Ry aW5nLmg+DQorDQorY2xhc3MgVGFzazsNCisNCitjbGFzcyBMb2dpbmcgew0K Kw0KK3ByaXZhdGU6DQorICBQcmVmZXJlbmNlcyAqX3ByZWZlcmVuY2VzOw0K KyAgc3RhdGljIExvZ2luZyAqX2luc3RhbmNlOw0KKyAgdm9pZCBsb2coIFRh c2sgKnRhc2ssIHNob3J0IHR5cGUsIGxvbmcgbWludXRlcyA9IDApOw0KKw0K K3B1YmxpYzoNCisgIHN0YXRpYyBMb2dpbmcgKmluc3RhbmNlKCk7DQorICBM b2dpbmcoKTsNCisgIH5Mb2dpbmcoKTsNCisgIHZvaWQgc3RhcnQoIFRhc2sg KnRhc2spOw0KKyAgdm9pZCBzdG9wKCBUYXNrICp0YXNrKTsNCisgIHZvaWQg bmV3VG90YWxUaW1lKCBUYXNrICp0YXNrLCBsb25nIG1pbnV0ZXMpOw0KKyAg dm9pZCBuZXdTZXNzaW9uVGltZSggVGFzayAqdGFzaywgbG9uZyBtaW51dGVz KTsNCisgIFFTdHJpbmcgTG9naW5nOjpjb25zdHJ1Y3RUYXNrTmFtZShUYXNr ICp0YXNrKTsNCisgIFFTdHJpbmcgZXNjYXBlWE1MKCBRU3RyaW5nIHN0cmlu Zyk7DQorDQorfTsNCisNCisjZW5kaWYNCisNCisNCisNCmRpZmYgLWIgLUIg LXUgLU4gLVAgLXIga2FybS9tYWluLmNwcCBrYXJtLnRwby9tYWluLmNwcA0K LS0tIGthcm0vbWFpbi5jcHAJRnJpIE1heSAyNSAyMTowMzo1MSAyMDAxDQor Kysga2FybS50cG8vbWFpbi5jcHAJV2VkIE1heSAyMyAxNzozMTowMyAyMDAx DQpAQCAtMTQsMTEgKzE0LDEyIEBADQogew0KIAlLQWJvdXREYXRhIGFib3V0 RGF0YSggImthcm0iLCBJMThOX05PT1AoIktBcm0iKSwNCiAJCUtBUk1fVkVS U0lPTiwgZGVzY3JpcHRpb24sIEtBYm91dERhdGE6OkxpY2Vuc2VfR1BMLA0K LQkJIihjKSAxOTk3LTIwMDAsIFNpcnRhaiBTaW5naCBLYW5nLCBFc3BlbiBT YW5kLCBKZXNwZXIgUGVkZXJzZW4sXG5LYWxsZSBEYWxoZWltZXIsIEtsYXLk bHZkYWxlbnMgRGF0YWtvbnN1bHQgQUIiKTsNCisJCSIoYykgMTk5Ny0yMDAw LCBTaXJ0YWogU2luZ2ggS2FuZywgRXNwZW4gU2FuZCwgSmVzcGVyIFBlZGVy c2VuLFxuS2FsbGUgRGFsaGVpbWVyLCBLbGFy5Gx2ZGFsZW5zIERhdGFrb25z dWx0IEFCLCBUb21hcyBQb3NwaXNlayAtIFNvdXJjZXBvbGUiKTsNCiAJYWJv dXREYXRhLmFkZEF1dGhvciggIkplc3BlciBQZWRlcnNlbiIsIEkxOE5fTk9P UCgiQ3VycmVudCBNYWludGFpbmVyIiksICJibGFja2llQGtkZS5vcmciICk7 DQogCWFib3V0RGF0YS5hZGRBdXRob3IoICJTaXJ0YWogU2luZ2ggS2FuZyIs IEkxOE5fTk9PUCgiT3JpZ2luYWwgQXV0aG9yIiksICJ0YWpAa2RlLm9yZyIg KTsNCiAJYWJvdXREYXRhLmFkZEF1dGhvcigiRXNwZW4gU2FuZCIsMCwgImVz cGVuQGtkZS5vcmciKTsNCiAJYWJvdXREYXRhLmFkZEF1dGhvciggIkthbGxl IERhbGhlaW1lciIsIDAsICJrYWxsZUBrZGUub3JnIiApOw0KKwlhYm91dERh dGEuYWRkQXV0aG9yKCAiVG9tYXMgUG9zcGlzZWsiLCAwLCAidHBvQHNvdXJj ZXBvbGUuY2giICk7DQogCQ0KIAlLQ21kTGluZUFyZ3M6OmluaXQoIGFyZ2Ms IGFyZ3YsICZhYm91dERhdGEgKTsNCiAJS0FwcGxpY2F0aW9uIG15QXBwOw0K ZGlmZiAtYiAtQiAtdSAtTiAtUCAtciBrYXJtL3ByZWZlcmVuY2VzLmNwcCBr YXJtLnRwby9wcmVmZXJlbmNlcy5jcHANCi0tLSBrYXJtL3ByZWZlcmVuY2Vz LmNwcAlGcmkgTWF5IDI1IDIxOjAzOjUyIDIwMDENCisrKyBrYXJtLnRwby9w cmVmZXJlbmNlcy5jcHAJRnJpIE1heSAyNSAxNjo1MDo0MiAyMDAxDQpAQCAt MjcsNyArMjcsMTggQEANCiAgIG5ldyBRTGFiZWwoaTE4bigiRmlsZSB0byBz YXZlIHRpbWUgaW5mb3JtYXRpb24gdG8iKSwgYm94MywgInNhdmUgbGFiZWwi KTsNCiAgIF9zYXZlRmlsZVcgPSBuZXcgUUxpbmVFZGl0KGJveDMsICJfc2F2 ZUZpbGVXIik7DQogICANCi0gIF9kb0F1dG9TYXZlVyA9IG5ldyBRQ2hlY2tC b3goaTE4bigiQXV0b21hdGljYWxseSBzYXZlIHRhc2tzIiksIGF1dG9TYXZl TWVudSwgIl9kb0F1dG9TYXZlVyIpOw0KKyAgX2RvVGltZUxvZ2luZ1cgPSBu ZXcgUUNoZWNrQm94KGkxOG4oIkRvIHRpbWUgbG9naW5nIiksIGF1dG9TYXZl TWVudSwNCisgIAkJCQkJCQkJICJfZG9UaW1lTG9naW5nVyIpOw0KKyAgY29u bmVjdChfZG9UaW1lTG9naW5nVywgU0lHTkFMKGNsaWNrZWQoKSksDQorCQkg IHRoaXMsIFNMT1QodGltZUxvZ2luZ0NoZWNrQm94Q2hhbmdlZCgpKSk7DQor ICANCisgIFFIQm94ICpib3g0ID0gbmV3IFFIQm94KGF1dG9TYXZlTWVudSk7 DQorICBfdGltZUxvZ2luZ0xhYmVsVyA9IG5ldyBRTGFiZWwoaTE4bigiRmls ZSB0byBsb2cgdGhlIHRpbWVzIHRvIiksIGJveDQsDQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgInNhdmUgbGFiZWwiKTsNCisgIF90aW1lTG9n VyA9IG5ldyBRTGluZUVkaXQoYm94NCwgIl90aW1lTG9nVyIpOw0KKyAgDQor ICBfZG9BdXRvU2F2ZVcgPSBuZXcgUUNoZWNrQm94KGkxOG4oIkF1dG9tYXRp Y2FsbHkgc2F2ZSB0YXNrcyIpLCBhdXRvU2F2ZU1lbnUsDQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJfZG9BdXRvU2F2ZVciKTsNCiAgIGNv bm5lY3QoX2RvQXV0b1NhdmVXLCBTSUdOQUwoY2xpY2tlZCgpKSwgDQogICAg ICAgICAgIHRoaXMsIFNMT1QoYXV0b1NhdmVDaGVja0JveENoYW5nZWQoKSkp Ow0KICAgDQpAQCAtNzYsNiArODcsOSBAQA0KICAgLy8gc2V0IGFsbCB3aWRn ZXRzDQogICBfc2F2ZUZpbGVXLT5zZXRUZXh0KF9zYXZlRmlsZVYpOw0KIA0K KyAgX2RvVGltZUxvZ2luZ1ctPnNldENoZWNrZWQoX2RvVGltZUxvZ2luZ1Yp Ow0KKyAgX3RpbWVMb2dXLT5zZXRUZXh0KF90aW1lTG9nVik7DQorDQogICBf ZG9JZGxlRGV0ZWN0aW9uVy0+c2V0Q2hlY2tlZChfZG9JZGxlRGV0ZWN0aW9u Vik7DQogICBfaWRsZURldGVjdFZhbHVlVy0+c2V0VmFsdWUoX2lkbGVEZXRl Y3RWYWx1ZVYpOw0KIA0KQEAgLTg5LDYgKzEwMyw4IEBADQogdm9pZCBQcmVm ZXJlbmNlczo6c2xvdE9rKCkgDQogew0KICAgX3NhdmVGaWxlViA9IF9zYXZl RmlsZVctPnRleHQoKTsNCisgIF90aW1lTG9nViA9IF90aW1lTG9nVy0+dGV4 dCgpOw0KKyAgX2RvVGltZUxvZ2luZ1YgICAgPSBfZG9UaW1lTG9naW5nVy0+ aXNDaGVja2VkKCk7DQogICBfZG9JZGxlRGV0ZWN0aW9uViA9IF9kb0lkbGVE ZXRlY3Rpb25XLT5pc0NoZWNrZWQoKTsNCiAgIF9pZGxlRGV0ZWN0VmFsdWVW ID0gX2lkbGVEZXRlY3RWYWx1ZVctPnZhbHVlKCk7DQogICBfZG9BdXRvU2F2 ZVYgICAgPSBfZG9BdXRvU2F2ZVctPmlzQ2hlY2tlZCgpOw0KQEAgLTExOCw5 ICsxMzQsMTggQEANCiAgIF9hdXRvU2F2ZVZhbHVlVy0+c2V0RW5hYmxlZChl bmFibGVkKTsNCiB9DQogDQordm9pZCBQcmVmZXJlbmNlczo6dGltZUxvZ2lu Z0NoZWNrQm94Q2hhbmdlZCgpDQorew0KKyAgYm9vbCBlbmFibGVkID0gX2Rv VGltZUxvZ2luZ1ctPmlzQ2hlY2tlZCgpOw0KKyAgX3RpbWVMb2dpbmdMYWJl bFctPnNldEVuYWJsZWQoZW5hYmxlZCk7DQorICBfdGltZUxvZ1ctPnNldEVu YWJsZWQoZW5hYmxlZCk7DQorfQ0KKw0KIHZvaWQgUHJlZmVyZW5jZXM6OmVt aXRTaWduYWxzKCkgDQogew0KICAgZW1pdChzYXZlRmlsZShfc2F2ZUZpbGVW KSk7DQorICBlbWl0KHRpbWVMb2dpbmcoX2RvVGltZUxvZ2luZ1YpKTsNCisg IGVtaXQodGltZUxvZyhfdGltZUxvZ1YpKTsNCiAgIGVtaXQoZGV0ZWN0SWRs ZW5lc3MoX2RvSWRsZURldGVjdGlvblYpKTsNCiAgIGVtaXQoaWRsZW5lc3NU aW1lb3V0KF9pZGxlRGV0ZWN0VmFsdWVWKSk7DQogICBlbWl0KGF1dG9TYXZl KF9kb0F1dG9TYXZlVikpOw0KQEAgLTEzMyw2ICsxNTgsMTEgQEANCiAgIHJl dHVybiBfc2F2ZUZpbGVWOw0KIH0NCiANCitRU3RyaW5nIFByZWZlcmVuY2Vz Ojp0aW1lTG9nKCkNCit7DQorICByZXR1cm4gX3RpbWVMb2dWOw0KK30NCisN CiBib29sIFByZWZlcmVuY2VzOjpkZXRlY3RJZGxlbmVzcygpDQogew0KICAg cmV0dXJuIF9kb0lkbGVEZXRlY3Rpb25WOw0KQEAgLTE0OCw2ICsxNzgsMTEg QEANCiAgIHJldHVybiBfZG9BdXRvU2F2ZVY7DQogfQ0KIA0KK2Jvb2wgUHJl ZmVyZW5jZXM6OnRpbWVMb2dpbmcoKSANCit7DQorICByZXR1cm4gX2RvVGlt ZUxvZ2luZ1Y7DQorfQ0KKw0KIGludCBQcmVmZXJlbmNlczo6YXV0b1NhdmVQ ZXJpb2QoKQ0KIHsNCiAgIHJldHVybiBfYXV0b1NhdmVWYWx1ZVY7DQpAQCAt MTY5LDYgKzIwNCwxMSBAQA0KICAgX3NhdmVGaWxlViAgICAgID0gY29uZmln LnJlYWRFbnRyeShRU3RyaW5nOjpmcm9tTGF0aW4xKCJmaWxlIiksIA0KICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2NhdGVMb2Nh bCgiYXBwZGF0YSIsDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFFTdHJpbmc6OmZyb21MYXRpbjEoImthcm1k YXRhLnR4dCIpKSk7DQorICBfZG9UaW1lTG9naW5nViAgPSBjb25maWcucmVh ZEJvb2xFbnRyeShRU3RyaW5nOjpmcm9tTGF0aW4xKCJ0aW1lIGxvZ2luZyIp LA0KKyAgZmFsc2UpOw0KKyAgX3RpbWVMb2dWICAgPSBjb25maWcucmVhZEVu dHJ5KFFTdHJpbmc6OmZyb21MYXRpbjEoInRpbWUgbG9nIGZpbGUiKSwNCisg IAkJCQkJCQkJIGxvY2F0ZUxvY2FsKCJhcHBkYXRhIiwNCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBRU3RyaW5nOjpm cm9tTGF0aW4xKCJrYXJtbG9nLnR4dCIpKSk7DQogICBfZG9BdXRvU2F2ZVYg ICAgPSBjb25maWcucmVhZEJvb2xFbnRyeShRU3RyaW5nOjpmcm9tTGF0aW4x KCJhdXRvIHNhdmUiKSwgdHJ1ZSk7DQogICBfYXV0b1NhdmVWYWx1ZVYgPSBj b25maWcucmVhZE51bUVudHJ5KFFTdHJpbmc6OmZyb21MYXRpbjEoImF1dG8g c2F2ZSBwZXJpb2QiKSwgNSk7DQogDQpAQCAtMTg1LDYgKzIyNSw4IEBADQog DQogICBjb25maWcuc2V0R3JvdXAoIFFTdHJpbmc6OmZyb21MYXRpbjEoIlNh dmluZyIpKTsNCiAgIGNvbmZpZy53cml0ZUVudHJ5KCBRU3RyaW5nOjpmcm9t TGF0aW4xKCJmaWxlIiksIF9zYXZlRmlsZVYpOw0KKyAgY29uZmlnLndyaXRl RW50cnkoIFFTdHJpbmc6OmZyb21MYXRpbjEoInRpbWUgbG9naW5nIiksIF9k b1RpbWVMb2dpbmdWKTsNCisgIGNvbmZpZy53cml0ZUVudHJ5KCBRU3RyaW5n Ojpmcm9tTGF0aW4xKCJ0aW1lIGxvZyBmaWxlIiksIF90aW1lTG9nVik7DQog ICBjb25maWcud3JpdGVFbnRyeSggUVN0cmluZzo6ZnJvbUxhdGluMSgiYXV0 byBzYXZlIiksIF9kb0F1dG9TYXZlVik7DQogICBjb25maWcud3JpdGVFbnRy eSggUVN0cmluZzo6ZnJvbUxhdGluMSgiYXV0byBzYXZlIHBlcmlvZCIpLCBf YXV0b1NhdmVWYWx1ZVYpOw0KIA0KZGlmZiAtYiAtQiAtdSAtTiAtUCAtciBr YXJtL3ByZWZlcmVuY2VzLmgga2FybS50cG8vcHJlZmVyZW5jZXMuaA0KLS0t IGthcm0vcHJlZmVyZW5jZXMuaAlGcmkgTWF5IDI1IDIxOjAzOjUyIDIwMDEN CisrKyBrYXJtLnRwby9wcmVmZXJlbmNlcy5oCUZyaSBNYXkgMjUgMTY6Mjg6 MTcgMjAwMQ0KQEAgLTIxLDYgKzIxLDggQEANCiAgIGJvb2wgZGV0ZWN0SWRs ZW5lc3MoKTsNCiAgIGludCBpZGxlbmVzc1RpbWVvdXQoKTsNCiAgIFFTdHJp bmcgc2F2ZUZpbGUoKTsNCisgIGJvb2wgdGltZUxvZ2luZygpOw0KKyAgUVN0 cmluZyB0aW1lTG9nKCk7DQogICBib29sIGF1dG9TYXZlKCk7DQogICBpbnQg YXV0b1NhdmVQZXJpb2QoKTsNCiANCkBAIC0zNCw2ICszNiw4IEBADQogICB2 b2lkIGRldGVjdElkbGVuZXNzKGJvb2wgb24pOw0KICAgdm9pZCBpZGxlbmVz c1RpbWVvdXQoaW50IG1pbnV0ZXMpOw0KICAgdm9pZCBzYXZlRmlsZShRU3Ry aW5nKTsNCisgIHZvaWQgdGltZUxvZ2luZyhib29sIG9uKTsNCisgIHZvaWQg dGltZUxvZyhRU3RyaW5nKTsNCiAgIHZvaWQgYXV0b1NhdmUoYm9vbCBvbik7 DQogICB2b2lkIGF1dG9TYXZlUGVyaW9kKGludCBtaW51dGVzKTsNCiAgIHZv aWQgc2V0dXBDaGFuZ2VkKCk7DQpAQCAtNDMsNiArNDcsNyBAQA0KICAgdmly dHVhbCB2b2lkIHNsb3RDYW5jZWwoKTsNCiAgIHZvaWQgaWRsZURldGVjdENo ZWNrQm94Q2hhbmdlZCgpOw0KICAgdm9pZCBhdXRvU2F2ZUNoZWNrQm94Q2hh bmdlZCgpOw0KKyAgdm9pZCB0aW1lTG9naW5nQ2hlY2tCb3hDaGFuZ2VkKCk7 DQogICANCiBwcm90ZWN0ZWQ6DQogICB2b2lkIGVtaXRTaWduYWxzKCk7DQpA QCAtNTMsMTYgKzU4LDE2IEBADQogICBib29sIF91bnNhdmVkQ2hhbmdlczsN CiANCiAgIC8vIFdpZGdldHMgaW4gdGhlIGRpYWxvZyAoQWxsIHZhcmlhYmxl cyBlbmRzIGluIFcgdG8gaW5kaWNhdGUgdGhhdCB0aGV5IGFyZSBXaWRnZXRz KQ0KLSAgUUNoZWNrQm94ICpfZG9JZGxlRGV0ZWN0aW9uVywgKl9kb0F1dG9T YXZlVzsNCi0gIFFMYWJlbCAgICAqX2lkbGVEZXRlY3RMYWJlbFcsICpfYXV0 b1NhdmVMYWJlbFc7DQorICBRQ2hlY2tCb3ggKl9kb0lkbGVEZXRlY3Rpb25X LCAqX2RvQXV0b1NhdmVXLCAqX2RvVGltZUxvZ2luZ1c7DQorICBRTGFiZWwg ICAgKl9pZGxlRGV0ZWN0TGFiZWxXLCAqX2F1dG9TYXZlTGFiZWxXLCAqX3Rp bWVMb2dpbmdMYWJlbFc7DQogICBRU3BpbkJveCAgKl9pZGxlRGV0ZWN0VmFs dWVXLCAqX2F1dG9TYXZlVmFsdWVXOw0KLSAgUUxpbmVFZGl0ICpfc2F2ZUZp bGVXOw0KKyAgUUxpbmVFZGl0ICpfc2F2ZUZpbGVXLCAqX3RpbWVMb2dXOw0K ICAgUVZCb3ggKmlkbGVNZW51Ow0KICAgDQogICAvLyBWYWx1ZXMgZm9yIHRo ZSBwcmVmZXJlbmNlcy4gKEFsbCB2YXJpYWJsZXMgaW4gaW4gViB0byBpbmRp Y2F0ZSB0aGV5IGFyZSBWYWx1ZXMpDQotICBib29sIF9kb0lkbGVEZXRlY3Rp b25WLCBfZG9BdXRvU2F2ZVY7DQorICBib29sIF9kb0lkbGVEZXRlY3Rpb25W LCBfZG9BdXRvU2F2ZVYsIF9kb1RpbWVMb2dpbmdWOw0KICAgaW50ICBfaWRs ZURldGVjdFZhbHVlViwgX2F1dG9TYXZlVmFsdWVWOw0KLSAgUVN0cmluZyBf c2F2ZUZpbGVWOw0KKyAgUVN0cmluZyBfc2F2ZUZpbGVWLCBfdGltZUxvZ1Y7 DQogICANCiB9Ow0KIA0KZGlmZiAtYiAtQiAtdSAtTiAtUCAtciBrYXJtL3Rh c2suY3BwIGthcm0udHBvL3Rhc2suY3BwDQotLS0ga2FybS90YXNrLmNwcAlG cmkgTWF5IDI1IDIxOjAzOjUzIDIwMDENCisrKyBrYXJtLnRwby90YXNrLmNw cAlGcmkgTWF5IDI1IDIwOjE5OjIyIDIwMDENCkBAIC01LDYgKzUsNyBAQA0K ICNpbmNsdWRlIDxraWNvbmxvYWRlci5oPg0KICNpbmNsdWRlIDxxdGltZXIu aD4NCiAjaW5jbHVkZSJ0YXNrLmgiDQorI2luY2x1ZGUibG9naW5nLmgiDQog DQogDQogUVZlY3RvcjxRUGl4bWFwPiAqVGFzazo6aWNvbnMgPSAwOw0KQEAg LTM0LDYgKzM1LDkgQEANCiAgICAgfQ0KICAgfQ0KICAgDQorICAvLyBpcyB0 aGlzIHRoZSByaWdodCBwbGFjZT8NCisgIF9sb2dpbmcgPSBMb2dpbmc6Omlu c3RhbmNlKCk7DQorDQogCV9uYW1lID0gdGFza05hbWUuc3RyaXBXaGl0ZVNw YWNlKCk7IA0KIAlfdG90YWxUaW1lID0gbWludXRlczsNCiAgIF9zZXNzaW9u VGltZSA9IHNlc3Npb25UaW1lOw0KQEAgLTUwLDYgKzU0LDcgQEANCiAgIGlm IChvbikgew0KICAgICBpZiAoIV90aW1lci0+aXNBY3RpdmUoKSkgew0KICAg ICAgIF90aW1lci0+c3RhcnQoMTAwMCk7DQorCSAgX2xvZ2luZy0+c3RhcnQo dGhpcyk7DQogICAgICAgX2k9NzsNCiAgICAgICB1cGRhdGVBY3RpdmVJY29u KCk7DQogICAgIH0NCkBAIC01Nyw2ICs2Miw3IEBADQogICBlbHNlIHsNCiAg ICAgaWYgKF90aW1lci0+aXNBY3RpdmUoKSkgew0KICAgICAgIF90aW1lci0+ c3RvcCgpOw0KKwkgIF9sb2dpbmctPnN0b3AodGhpcyk7DQogICAgICAgc2V0 UGl4bWFwKDEsIFVzZXJJY29uKFFTdHJpbmc6OmZyb21MYXRpbjEoImVtcHR5 LXdhdGNoLnhwbSIpKSk7DQogICAgIH0NCiAgIH0NCkBAIC03MSwxMiArNzcs MTQgQEANCiB2b2lkIFRhc2s6OnNldFRvdGFsVGltZSAoIGxvbmcgbWludXRl cyApDQogew0KIAlfdG90YWxUaW1lID0gbWludXRlczsNCisJX2xvZ2luZy0+ bmV3VG90YWxUaW1lKCB0aGlzLCBtaW51dGVzKTsNCiAJdXBkYXRlKCk7DQog fQ0KIA0KIHZvaWQgVGFzazo6c2V0U2Vzc2lvblRpbWUgKCBsb25nIG1pbnV0 ZXMgKQ0KIHsNCiAJX3Nlc3Npb25UaW1lID0gbWludXRlczsNCisJX2xvZ2lu Zy0+bmV3U2Vzc2lvblRpbWUoIHRoaXMsIG1pbnV0ZXMpOw0KIAl1cGRhdGUo KTsNCiB9DQogDQpkaWZmIC1iIC1CIC11IC1OIC1QIC1yIGthcm0vdGFzay5o IGthcm0udHBvL3Rhc2suaA0KLS0tIGthcm0vdGFzay5oCUZyaSBNYXkgMjUg MjE6MDM6NTQgMjAwMQ0KKysrIGthcm0udHBvL3Rhc2suaAlGcmkgTWF5IDI1 IDIwOjE4OjU0IDIwMDENCkBAIC04LDkgKzgsMTEgQEANCiAjaW5jbHVkZSA8 cXZlY3Rvci5oPg0KICNpbmNsdWRlIDxxcGl4bWFwLmg+DQogI2luY2x1ZGUg Imthcm0uaCINCisjaW5jbHVkZSAibG9naW5nLmgiDQogDQogY2xhc3MgUUZp bGU7DQogY2xhc3MgUVRpbWVyOw0KK2NsYXNzIExvZ2luZzsNCiANCiAvKioN CiAJRW5jYXBzdWxhdGVzIGEgdGFzay4NCkBAIC0yNyw2ICsyOSw3IEBADQog ICBRVGltZXIgKl90aW1lcjsNCiAgIGludCBfaTsNCiAgIHN0YXRpYyBRVmVj dG9yPFFQaXhtYXA+ICppY29uczsNCisgICAgTG9naW5nICpfbG9naW5nOw0K IA0KIHB1YmxpYzoNCiAJLyoqIGNvbnN0cnVjdG9yICovDQpkaWZmIC1iIC1C IC11IC1OIC1QIC1yIGthcm0vTWFrZWZpbGUuYW0ga2FybS50cG8vTWFrZWZp bGUuYW0NCi0tLSBrYXJtL01ha2VmaWxlLmFtCUZyaSBNYXkgMjUgMjE6MDM6 NDUgMjAwMQ0KKysrIGthcm0udHBvL01ha2VmaWxlLmFtCUZyaSBNYXkgMjUg MjE6NDQ6MTggMjAwMQ0KQEAgLTEzLDggKzEzLDggQEANCiANCiBrYXJtX1NP VVJDRVMgPSAgYWRkZGxnLmNwcCBrYXJtLmNwcCBtYWluLmNwcCBpZGxlLmNw cCBcDQogCXRhc2suY3BwIHRvcC5jcHAga2FjY2VsbWVudXdhdGNoLmNwcCBw cmludC5jcHAgZG9ja2luZy5jcHBcDQotCXByZWZlcmVuY2VzLmNwcCBrdGlt ZXdpZGdldC5jcHANCi1ub2luc3RfSEVBREVSUyA9IGFkZGRsZy5oIGthcm0u aCB0YXNrLmggdG9vbGljb25zLmggdG9wLmgga2FjY2VsbWVudXdhdGNoLmgg dmVyc2lvbi5oIHByaW50LmggaWRsZS5oIGRvY2tpbmcuaCBwcmVmZXJlbmNl cy5oIGt0aW1ld2lkZ2V0LmgNCisJcHJlZmVyZW5jZXMuY3BwIGt0aW1ld2lk Z2V0LmNwcCBsb2dpbmcuY3BwDQorbm9pbnN0X0hFQURFUlMgPSBhZGRkbGcu aCBrYXJtLmggdGFzay5oIHRvb2xpY29ucy5oIHRvcC5oIGthY2NlbG1lbnV3 YXRjaC5oIHZlcnNpb24uaCBwcmludC5oIGlkbGUuaCBkb2NraW5nLmggcHJl ZmVyZW5jZXMuaCBrdGltZXdpZGdldC5oIGxvZ2luZy5oDQogDQogS0RFX0lD T04gPSBrYXJtDQogDQo= ---1463782655-1168542593-990818821=:2838-- >> Visit http://master.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<