From kde-core-devel Tue Jan 29 20:56:41 2002 From: Martijn Klingens Date: Tue, 29 Jan 2002 20:56:41 +0000 To: kde-core-devel Subject: [PATCH] ksmserver X-MARC-Message: https://marc.info/?l=kde-core-devel&m=101233780125437 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------Boundary-00=_03XPYQ8ZGNRAKWFJ9JEZ" --------------Boundary-00=_03XPYQ8ZGNRAKWFJ9JEZ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Hiya, Attached patch makes the ksmserver logout dialog look more like KDialogBase, i.e. use KPushButton and have a horizontal line above the buttons. It also makes 'make check' actually compile. As the patch itself is pretty much trivial I'd probably commit right away, save for one thing: I needed to add '$(LIB_KDEUI)' to the Makefile.am, which I don't consider trivial. Is there a reason for ksmserver not using kdeui, or is it safe to commit this? It seems to work fine here, but I don't know if that sais a lot... Martijn --------------Boundary-00=_03XPYQ8ZGNRAKWFJ9JEZ Content-Type: text/x-diff; charset="iso-8859-1"; name="ksmserver.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ksmserver.diff" SW5kZXg6IE1ha2VmaWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGViYXNl L2tzbXNlcnZlci9NYWtlZmlsZS5hbSx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMgpkaWZmIC11 IC1wIC1yMS4xMiBNYWtlZmlsZS5hbQotLS0gTWFrZWZpbGUuYW0JMjAwMi8wMS8xNSAxMjoyNDow MQkxLjEyCisrKyBNYWtlZmlsZS5hbQkyMDAyLzAxLzI5IDIwOjUyOjI4CkBAIC0zMCwxNCArMzAs MTQgQEAga3Ntc2VydmVyX1NPVVJDRVMgPSBkdW1teS5jcHAKIAoga3Ntc2VydmVyX2xhX0xERkxB R1MgPSAkKGFsbF9saWJyYXJpZXMpIC1hdm9pZC12ZXJzaW9uIC1tb2R1bGUKIGtzbXNlcnZlcl9M REZMQUdTID0gJChhbGxfbGlicmFyaWVzKSAkKEtERV9SUEFUSCkKLWtzbXNlcnZlcl9sYV9MSUJB REQgPSAkKExJQl9LREVDT1JFKQora3Ntc2VydmVyX2xhX0xJQkFERCA9ICQoTElCX0tERUNPUkUp ICQoTElCX0tERVVJKQoga3Ntc2VydmVyX0xEQUREID0ga3Ntc2VydmVyLmxhCiAKIGNoZWNrX1BS T0dSQU1TID0gdGVzdHNoCiB0ZXN0c2hfU09VUkNFUyA9IHRlc3QuY3BwIHNodXRkb3duLmNwcAog CiB0ZXN0c2hfTERGTEFHUyA9ICQoYWxsX2xpYnJhcmllcykgJChLREVfUlBBVEgpCi10ZXN0c2hf TERBREQgPSAkKExJQl9LREVDT1JFKQordGVzdHNoX0xEQUREID0gJChMSUJfS0RFQ09SRSkgJChM SUJfS0RFVUkpCiAKIG1lc3NhZ2VzOgogCSQoWEdFVFRFWFQpICouY3BwIC1vICQocG9kaXIpL2tz bXNlcnZlci5wb3QKSW5kZXg6IHNodXRkb3duLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9t ZS9rZGUva2RlYmFzZS9rc21zZXJ2ZXIvc2h1dGRvd24uY3BwLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjE4CmRpZmYgLXUgLXAgLXIxLjE4IHNodXRkb3duLmNwcAotLS0gc2h1dGRvd24uY3BwCTIw MDIvMDEvMDQgMjI6NDQ6NTkJMS4xOAorKysgc2h1dGRvd24uY3BwCTIwMDIvMDEvMjkgMjA6NTI6 MjkKQEAgLTEzLDcgKzEzLDYgQEAgQ29weXJpZ2h0IChDKSAyMDAwIE1hdHRoaWFzIEV0dHJpY2gg PGV0dAogI2luY2x1ZGUgPHFjaGVja2JveC5oPgogI2luY2x1ZGUgPHFyYWRpb2J1dHRvbi5oPgog I2luY2x1ZGUgPHF2YnV0dG9uZ3JvdXAuaD4KLSNpbmNsdWRlIDxxcHVzaGJ1dHRvbi5oPgogI2lu Y2x1ZGUgPHFsYWJlbC5oPgogI2luY2x1ZGUgPHF2Ym94Lmg+CiAjaW5jbHVkZSA8cXBhaW50ZXIu aD4KQEAgLTI0LDYgKzIzLDggQEAgQ29weXJpZ2h0IChDKSAyMDAwIE1hdHRoaWFzIEV0dHJpY2gg PGV0dAogI2luY2x1ZGUgPGtsb2NhbGUuaD4KICNpbmNsdWRlIDxrYXBwbGljYXRpb24uaD4KICNp bmNsdWRlIDxrZGVidWcuaD4KKyNpbmNsdWRlIDxrcHVzaGJ1dHRvbi5oPgorI2luY2x1ZGUgPGtz dGRndWlpdGVtLmg+CiAjaW5jbHVkZSA8a3dpbi5oPgogCiAjaW5jbHVkZSA8WDExL1hsaWIuaD4K QEAgLTExMSwxNyArMTEyLDIyIEBAIEtTTVNodXRkb3duRGxnOjpLU01TaHV0ZG93bkRsZyggUVdp ZGdldCoKICAgICB2Ym94LT5hZGRXaWRnZXQoIGNoZWNrYm94LCAwLCBBbGlnbkxlZnQgICk7CiAg ICAgdmJveC0+YWRkU3RyZXRjaCgpOwogCisgICAgUUZyYW1lICpsaW5lID0gbmV3IFFGcmFtZSgg ZnJhbWUgKTsKKyAgICBsaW5lLT5zZXRGcmFtZVNoYXBlKCBRRnJhbWU6OkhMaW5lICk7CisgICAg bGluZS0+c2V0RnJhbWVTaGFkb3coIFFGcmFtZTo6U3Vua2VuICk7CisgICAgdmJveC0+YWRkV2lk Z2V0KCBsaW5lICk7CisKICAgICBRSEJveExheW91dCogaGJveCA9IG5ldyBRSEJveExheW91dCgg dmJveCApOwogICAgIGhib3gtPmFkZFN0cmV0Y2goKTsKLSAgICBRUHVzaEJ1dHRvbiogeWVzID0g bmV3IFFQdXNoQnV0dG9uKG1heXNkID8gaTE4bigiJk9LIikgOiBpMThuKCImTG9nb3V0IiksIGZy YW1lICk7CisgICAgS0d1aUl0ZW0gbG9nb3V0SXRlbSggaTE4biggIiZMb2dvdXQiICksICJleGl0 IiApOworICAgIEtQdXNoQnV0dG9uKiB5ZXMgPSBuZXcgS1B1c2hCdXR0b24oIG1heXNkID8gS1N0 ZEd1aUl0ZW06Om9rKCkgOiBsb2dvdXRJdGVtLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGZyYW1lICk7CiAgICAgY29ubmVjdCggeWVzLCBTSUdOQUwoIGNsaWNrZWQo KSApLCBTTE9UKCBhY2NlcHQoKSApICk7CiAgICAgeWVzLT5zZXREZWZhdWx0KCBUUlVFICk7CiAg ICAgaGJveC0+YWRkV2lkZ2V0KCB5ZXMgKTsKLSAgICBoYm94LT5hZGRTdHJldGNoKCk7Ci0gICAg UVB1c2hCdXR0b24qIGNhbmNlbCA9IG5ldyBRUHVzaEJ1dHRvbihpMThuKCImQ2FuY2VsIiksIGZy YW1lICk7CisgICAgS1B1c2hCdXR0b24qIGNhbmNlbCA9IG5ldyBLUHVzaEJ1dHRvbiggS1N0ZEd1 aUl0ZW06OmNhbmNlbCgpLCBmcmFtZSApOwogICAgIGNvbm5lY3QoIGNhbmNlbCwgU0lHTkFMKCBj bGlja2VkKCkgKSwgU0xPVCggcmVqZWN0KCkgKSApOwogICAgIGhib3gtPmFkZFdpZGdldCggY2Fu Y2VsICk7Ci0gICAgaGJveC0+YWRkU3RyZXRjaCgpOwogCiAgICAgUVRpbWVyOjpzaW5nbGVTaG90 KCAwLCB0aGlzLCBTTE9UKCByZXF1ZXN0Rm9jdXMoKSApICk7CiAgICAgY2hlY2tib3gtPnNldEZv Y3VzKCk7CkluZGV4OiB0ZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2Rl YmFzZS9rc21zZXJ2ZXIvdGVzdC5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMgpkaWZmIC11 IC1wIC1yMS4yIHRlc3QuY3BwCi0tLSB0ZXN0LmNwcAkyMDAxLzEyLzI5IDE3OjI1OjA0CTEuMgor KysgdGVzdC5jcHAJMjAwMi8wMS8yOSAyMDo1MjoyOQpAQCAtMTQsNiArMTQsOSBAQCBtYWluKGlu dCBhcmdjLCBjaGFyICphcmd2W10pCiAgICBRT2JqZWN0Ojpjb25uZWN0KCBLU01TaHV0ZG93bkZl ZWRiYWNrOjpzZWxmKCksIFNJR05BTCggYWJvcnRlZCgpICksICZhLCBTTE9UKCBxdWl0KCkgKSAp OwogCiAgICBib29sIHNhdmVTZXNzaW9uOwotICAgKHZvaWQpS1NNU2h1dGRvd25EbGc6OmNvbmZp cm1TaHV0ZG93biggc2F2ZVNlc3Npb24gKTsKKyAgICBLQXBwbGljYXRpb246OlNodXRkb3duVHlw ZSBzZHR5cGUgPSBLQXBwbGljYXRpb246OlNodXRkb3duVHlwZU5vbmU7CisgICAgS0FwcGxpY2F0 aW9uOjpTaHV0ZG93bk1vZGUgc2Rtb2RlID0gS0FwcGxpY2F0aW9uOjpTaHV0ZG93bk1vZGVEZWZh dWx0OworICAgKHZvaWQpS1NNU2h1dGRvd25EbGc6OmNvbmZpcm1TaHV0ZG93biggc2F2ZVNlc3Np b24sIGZhbHNlLCBmYWxzZSwKKyAgICAgICAgc2R0eXBlLCBzZG1vZGUgKTsKICAgIGEuZXhlYygp OwogfQo= --------------Boundary-00=_03XPYQ8ZGNRAKWFJ9JEZ--