From owner-freebsd-xfce@FreeBSD.ORG Sat Jun 9 15:11:22 2012 Return-Path: Delivered-To: xfce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E63361065675 for ; Sat, 9 Jun 2012 15:11:22 +0000 (UTC) (envelope-from wblock@wonkity.com) Received: from wonkity.com (wonkity.com [67.158.26.137]) by mx1.freebsd.org (Postfix) with ESMTP id 86DED8FC0A for ; Sat, 9 Jun 2012 15:11:22 +0000 (UTC) Received: from wonkity.com (localhost [127.0.0.1]) by wonkity.com (8.14.5/8.14.5) with ESMTP id q59FBGtJ069457 for ; Sat, 9 Jun 2012 09:11:16 -0600 (MDT) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.14.5/8.14.5/Submit) with ESMTP id q59FBGta069454 for ; Sat, 9 Jun 2012 09:11:16 -0600 (MDT) (envelope-from wblock@wonkity.com) Date: Sat, 9 Jun 2012 09:11:15 -0600 (MDT) From: Warren Block To: xfce@freebsd.org Message-ID: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="-902635197-27595986-1339254676=:69406" X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (wonkity.com [127.0.0.1]); Sat, 09 Jun 2012 09:11:16 -0600 (MDT) Cc: Subject: Keyboard application shortcut fixes X-BeenThere: freebsd-xfce@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: XFCE for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2012 15:11:23 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. ---902635197-27595986-1339254676=:69406 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII https://bugzilla.xfce.org/show_bug.cgi?id=8744 has a couple of patches to allow certain modifiers like shift to work again in the Settings/Keyboard/Application Shortcuts dialog. These should be considered experimental, but are working here. These two patches go in x11/libxfce4menu/files. The diff paths have been changed from the originals so they would apply in the port. ---902635197-27595986-1339254676=:69406 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=patch-libxfce4kbd-private-xfce-shortcut-dialog.c Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=patch-libxfce4kbd-private-xfce-shortcut-dialog.c Y29tbWl0IDczMjRkZWE2NmQ3NTRmZjg2M2ZlYTMzNjJjOTBhY2M5Njg5Njcw YzYNCkF1dGhvcjogSGFyYWxkIEp1ZHQgPGguanVkdEBnbXguYXQ+DQpEYXRl OiAgIEZyaSBNYXkgNCAyMjoxNToxNiAyMDEyICswMjAwDQoNCiAgICBFbmFi bGUgPFNoaWZ0PiBhcyBtb2RpZmllciBrZXkgaW4gc2hvcnRjdXQgZGlhbG9n Lg0KICAgIA0KICAgIFRoaXMgcmVzdG9yZXMgdGhlIGZ1bmN0aW9uYWxpdHkg b2YgPFNoaWZ0PiBhcyBhIG1vZGlmaWVyIGtleS4NCiAgICBVc2luZyA8U2hp ZnRfTD4gYW5kIDxTaGlmdF9SPiBhcyBhIHNpbmdsZSBrZXkgaXMgc3RpbGwg cG9zc2libGUuDQogICAgDQogICAgSXQgc2VlbXMgZ3RrX2FjY2VsZXJhdG9y X25hbWUgaXMgbm90IGRlc2lnbmVkIHRvIGRpc3Rpbmd1aXNoIGJldHdlZW4N CiAgICB1cHBlci0vbG93ZXJjYXNlLCBzbyB3ZSBqdXN0IHN0b3JlIHRoZSA8 U2hpZnQ+IGtleSBpbiB0aGUgYWNjZWxlcmF0b3INCiAgICBuYW1lLiBUaGlz IG1pZ2h0IG5vdCBiZSB0aGUgcmVjb21tZW5kZWQgd2F5IHRvIHN0b3JlIGFj Y2VsZXJhdG9ycw0KICAgIGFzIHNwZWNpZmllZCBieSB0aGUgR1RLIGRvY3Ms IGJ1dCBhdCBsZWFzdCBpdCBmaXhlcyB0aGUgcmVncmVzc2lvbg0KICAgIGFu ZCBzZWVtcyB0byBub3QgY2F1c2UgYW55IHRyb3VibGVzLg0KDQpkaWZmIC0t Z2l0IGEvbGlieGZjZTRrYmQtcHJpdmF0ZS94ZmNlLXNob3J0Y3V0LWRpYWxv Zy5jIGIvbGlieGZjZTRrYmQtcHJpdmF0ZS94ZmNlLXNob3J0Y3V0LWRpYWxv Zy5jDQppbmRleCA1ZjFiMDU4Li5iMWNlMTU5IDEwMDY0NA0KLS0tIGxpYnhm Y2U0a2JkLXByaXZhdGUveGZjZS1zaG9ydGN1dC1kaWFsb2cuYw0KKysrIGxp YnhmY2U0a2JkLXByaXZhdGUveGZjZS1zaG9ydGN1dC1kaWFsb2cuYw0KQEAg LTMyNyw2ICszMjcsOCBAQCB4ZmNlX3Nob3J0Y3V0X2RpYWxvZ19rZXlfcHJl c3NlZCAoWGZjZVNob3J0Y3V0RGlhbG9nICpkaWFsb2csDQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmtleXZhbCwgTlVMTCwg TlVMTCwgJmNvbnN1bWVkKTsNCiANCiAgIC8qIEdldCB0aGUgbW9kaWZpZXJz ICovDQorICBpZiAoKG1vZGlmaWVycyAmIEdES19TSElGVF9NQVNLKSAmJiAo Y29uc3VtZWQgJiBHREtfU0hJRlRfTUFTSykpDQorICAgIGNvbnN1bWVkICY9 IH5HREtfU0hJRlRfTUFTSzsNCiAgIG1vZGlmaWVycyAmPSB+Y29uc3VtZWQ7 DQogICBtb2RpZmllcnMgJj0gbW9kX21hc2s7DQogDQo= ---902635197-27595986-1339254676=:69406 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=patch-libxfce4kbd-private-xfce-shortcuts-grabber.c Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=patch-libxfce4kbd-private-xfce-shortcuts-grabber.c Y29tbWl0IGZlNGFmZjZhMjAwMjRkOTQ4MDE5OWUxOWMxMzYxNGRkMTE4YmU3 MjUNCkF1dGhvcjogSGFyYWxkIEp1ZHQgPGguanVkdEBnbXguYXQ+DQpEYXRl OiAgIEZyaSBNYXkgNCAyMjoyNDoxMiAyMDEyICswMjAwDQoNCiAgICBFbmFi bGUgPFNoaWZ0PiBhcyBtb2RpZmllciBrZXkgaW4gc2hvcnRjdXRzIGdyYWJi ZXIuDQogICAgDQogICAgVGhpcyByZXN0b3JlcyB0aGUgZnVuY3Rpb25hbGl0 eSBvZiA8U2hpZnQ+IGFzIGEgbW9kaWZpZXIga2V5Lg0KICAgIFVzaW5nIDxT aGlmdF9MPiBhbmQgPFNoaWZ0X1I+IGFzIGEgc2luZ2xlIGtleSBpcyBzdGls bCBwb3NzaWJsZS4NCiAgICANCiAgICBJdCBzZWVtcyBndGtfYWNjZWxlcmF0 b3JfbmFtZSBpcyBub3QgZGVzaWduZWQgdG8gZGlzdGluZ3Vpc2ggYmV0d2Vl bg0KICAgIHVwcGVyLS9sb3dlcmNhc2UsIHNvIHdlIGp1c3Qgc3RvcmUgdGhl IDxTaGlmdD4ga2V5IGluIHRoZSBhY2NlbGVyYXRvcg0KICAgIG5hbWUuIFRo aXMgbWlnaHQgbm90IGJlIHRoZSByZWNvbW1lbmRlZCB3YXkgdG8gc3RvcmUg YWNjZWxlcmF0b3JzDQogICAgYXMgc3BlY2lmaWVkIGJ5IHRoZSBHVEsgZG9j cywgYnV0IGF0IGxlYXN0IGl0IGZpeGVzIHRoZSByZWdyZXNzaW9uDQogICAg YW5kIHNlZW1zIHRvIG5vdCBjYXVzZSBhbnkgdHJvdWJsZXMuDQogICAgDQog ICAgQWRkaXRpb25hbGx5LCB3ZSBuZWVkIHRvIGd0a19hY2NlbGVyYXRvcl9w YXJzZSB0aGUgdmFsdWUgcmV0dXJuZWQgYnkNCiAgICBndGtfYWNjZWxlcmF0 b3JfbmFtZSwgYmVjYXVzZSB0aGUga2V5IHZhbHVlcyBvZiBib3RoIGZ1bmN0 aW9ucyBhcmUNCiAgICBub3QgY29uc2lzdGVudC4NCg0KZGlmZiAtLWdpdCBh L2xpYnhmY2U0a2JkLXByaXZhdGUveGZjZS1zaG9ydGN1dHMtZ3JhYmJlci5j IGIvbGlieGZjZTRrYmQtcHJpdmF0ZS94ZmNlLXNob3J0Y3V0cy1ncmFiYmVy LmMNCmluZGV4IDlmYWVjMDcuLjAxYjg1YzMgMTAwNjQ0DQotLS0gbGlieGZj ZTRrYmQtcHJpdmF0ZS94ZmNlLXNob3J0Y3V0cy1ncmFiYmVyLmMNCisrKyBs aWJ4ZmNlNGtiZC1wcml2YXRlL3hmY2Utc2hvcnRjdXRzLWdyYWJiZXIuYw0K QEAgLTUxMiw4ICs1MTIsMTAgQEAgeGZjZV9zaG9ydGN1dHNfZ3JhYmJlcl9l dmVudF9maWx0ZXIgKEdka1hFdmVudCAgICAgICAgICAgICpnZGtfeGV2ZW50 LA0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZr ZXl2YWwsIE5VTEwsIE5VTEwsICZjb25zdW1lZCk7DQogDQogICAvKiBHZXQg dGhlIG1vZGlmaWVycyAqLw0KLSAgbW9kaWZpZXJzICY9IH5jb25zdW1lZDsN CisgIGlmICgobW9kaWZpZXJzICYgR0RLX1NISUZUX01BU0spICYmIChjb25z dW1lZCAmIEdES19TSElGVF9NQVNLKSkNCisgICAgY29uc3VtZWQgJj0gfkdE S19TSElGVF9NQVNLOw0KICAgZ2RrX2tleW1hcF9hZGRfdmlydHVhbF9tb2Rp ZmllcnMgKGtleW1hcCwgJm1vZGlmaWVycyk7DQorICBtb2RpZmllcnMgJj0g fmNvbnN1bWVkOw0KICAgbW9kaWZpZXJzICY9IG1vZF9tYXNrOw0KIA0KICAg Y29udGV4dC5rZXl2YWwgPSBrZXl2YWw7DQpAQCAtNTIxLDYgKzUyMyw3IEBA IHhmY2Vfc2hvcnRjdXRzX2dyYWJiZXJfZXZlbnRfZmlsdGVyIChHZGtYRXZl bnQgICAgICAgICAgICAqZ2RrX3hldmVudCwNCiANCiAgIHJhd19zaG9ydGN1 dF9uYW1lID0gZ3RrX2FjY2VsZXJhdG9yX25hbWUgKGtleXZhbCwgbW9kaWZp ZXJzKTsNCiAgIFRSQUNFICgiTG9va2luZyBmb3IgJXMiLCByYXdfc2hvcnRj dXRfbmFtZSk7DQorICBndGtfYWNjZWxlcmF0b3JfcGFyc2UgKHJhd19zaG9y dGN1dF9uYW1lLCAmY29udGV4dC5rZXl2YWwsICZjb250ZXh0Lm1vZGlmaWVy cyk7DQogICBnX2ZyZWUgKHJhd19zaG9ydGN1dF9uYW1lKTsNCiANCiAgIGdf aGFzaF90YWJsZV9mb3JlYWNoIChncmFiYmVyLT5wcml2LT5rZXlzLCAoR0hG dW5jKSBmaW5kX2V2ZW50X2tleSwgJmNvbnRleHQpOw0K ---902635197-27595986-1339254676=:69406--