Return-Path: Message-ID: <5f84803c0711130906m4a96901du1638f10d280d2ff6@mail.gmail.com> Date: Tue, 13 Nov 2007 12:06:18 -0500 From: "Chris Rivera" To: "BlueZ development" In-Reply-To: <1194971409.3140.41.camel@cookie.hadess.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_15575_19654844.1194973578325" References: <5f84803c0710161138i6123770dk22c1b63d03f45f59@mail.gmail.com> <1192631052.6184.25.camel@violet> <5f84803c0710170748j57f46eebh37a6707b9ec02b86@mail.gmail.com> <1192633908.10179.2.camel@snoogens.fab.redhat.com> <47173238.5070508@free.fr> <1193847250.32459.36.camel@violet> <1193847868.31723.99.camel@cookie.hadess.net> <5f84803c0711130824u2ad55b4bn36f42781b3c7ffe@mail.gmail.com> <1194971409.3140.41.camel@cookie.hadess.net> Subject: Re: [Bluez-devel] [PATCH] make bluez GNOME UIs singletons Reply-To: BlueZ development List-Id: BlueZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: bluez-devel-bounces@lists.sourceforge.net Errors-To: bluez-devel-bounces@lists.sourceforge.net ------=_Part_15575_19654844.1194973578325 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline On Nov 13, 2007 11:30 AM, Bastien Nocera wrote: > Could you modify the .desktop file that starts the applet as well? > Updated patch to include desktop file modification. Chris ------=_Part_15575_19654844.1194973578325 Content-Type: text/x-patch; name=bluez-gnome-singleton.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_f8yqph9q0 Content-Disposition: attachment; filename=bluez-gnome-singleton.patch SW5kZXg6IGFwcGxldC9ibHVldG9vdGgtYXBwbGV0LmRlc2t0b3AuaW4KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1Mg ZmlsZTogL2N2c3Jvb3QvYmx1ZXovZ25vbWUvYXBwbGV0L2JsdWV0b290aC1hcHBsZXQuZGVza3Rv cC5pbix2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xCmRpZmYgLXUgLXAgLXIxLjEgYmx1ZXRvb3Ro LWFwcGxldC5kZXNrdG9wLmluCi0tLSBhcHBsZXQvYmx1ZXRvb3RoLWFwcGxldC5kZXNrdG9wLmlu CTMgQXByIDIwMDcgMDg6MDk6MDEgLTAwMDAJMS4xCisrKyBhcHBsZXQvYmx1ZXRvb3RoLWFwcGxl dC5kZXNrdG9wLmluCTEzIE5vdiAyMDA3IDE3OjA0OjE1IC0wMDAwCkBAIC0zLDcgKzMsNyBAQCBF bmNvZGluZz1VVEYtOAogX05hbWU9Qmx1ZXRvb3RoIE1hbmFnZXIKIF9Db21tZW50PUJsdWV0b290 aCBNYW5hZ2VyIGFwcGxldAogSWNvbj1zdG9ja19ibHVldG9vdGgKLUV4ZWM9Ymx1ZXRvb3RoLWFw cGxldAorRXhlYz1ibHVldG9vdGgtYXBwbGV0IC0tc2luZ2xldG9uCiBUZXJtaW5hbD1mYWxzZQog VHlwZT1BcHBsaWNhdGlvbgogQ2F0ZWdvcmllcz0KSW5kZXg6IGFwcGxldC9tYWluLmMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvYmx1ZXovZ25vbWUvYXBwbGV0L21haW4uYyx2CnJldHJp ZXZpbmcgcmV2aXNpb24gMS44NwpkaWZmIC11IC1wIC1yMS44NyBtYWluLmMKLS0tIGFwcGxldC9t YWluLmMJMjkgQXVnIDIwMDcgMjA6NDI6MTggLTAwMDAJMS44NworKysgYXBwbGV0L21haW4uYwkx MyBOb3YgMjAwNyAxNzowNDoxNiAtMDAwMApAQCAtMzIsOSArMzIsOSBAQAogI2luY2x1ZGUgPHN0 cmluZy5oPgogCiAjaW5jbHVkZSA8ZGJ1cy9kYnVzLWdsaWIuaD4KKyNpbmNsdWRlIDxkYnVzL2Ri dXMtZ2xpYi1sb3dsZXZlbC5oPgogCiAjaWZkZWYgSEFWRV9IQUwKLSNpbmNsdWRlIDxkYnVzL2Ri dXMtZ2xpYi1sb3dsZXZlbC5oPgogI2luY2x1ZGUgPGhhbC9saWJoYWwuaD4KICNlbmRpZgogCkBA IC0xNTUzLDcgKzE1NTMsNyBAQCBzdGF0aWMgdm9pZCBhYm91dF9jYWxsYmFjayhHdGtXaWRnZXQg Kml0CiAKIHN0YXRpYyB2b2lkIHNldHRpbmdzX2NhbGxiYWNrKEdPYmplY3QgKndpZGdldCwgZ3Bv aW50ZXIgdXNlcl9kYXRhKQogewotCWNvbnN0IGNoYXIgKmNvbW1hbmQgPSAiYmx1ZXRvb3RoLXBy b3BlcnRpZXMiOworCWNvbnN0IGNoYXIgKmNvbW1hbmQgPSAiYmx1ZXRvb3RoLXByb3BlcnRpZXMg LS1zaW5nbGV0b24iOwogCiAJaWYgKCFnX3NwYXduX2NvbW1hbmRfbGluZV9hc3luYyhjb21tYW5k LCBOVUxMKSkKIAkJZ19wcmludGVycigiQ291bGRuJ3QgZXhlY3V0ZSBjb21tYW5kOiAlc1xuIiwg Y29tbWFuZCk7CkBAIC0xNjQyLDcgKzE2NDIsNyBAQCBzdGF0aWMgdm9pZCBzZW5kdG9fY2FsbGJh Y2soR09iamVjdCAqd2lkCiAjaWYgMAogc3RhdGljIHZvaWQgd2l6YXJkX2NhbGxiYWNrKEdPYmpl Y3QgKndpZGdldCwgZ3BvaW50ZXIgdXNlcl9kYXRhKQogewotCWNvbnN0IGNoYXIgKmNvbW1hbmQg PSAiYmx1ZXRvb3RoLXdpemFyZCI7CisJY29uc3QgY2hhciAqY29tbWFuZCA9ICJibHVldG9vdGgt d2l6YXJkIC0tc2luZ2xldG9uIjsKIAogCWlmICghZ19zcGF3bl9jb21tYW5kX2xpbmVfYXN5bmMo Y29tbWFuZCwgTlVMTCkpCiAJCWdfcHJpbnRlcnIoIkNvdWxkbid0IGV4ZWN1dGUgY29tbWFuZDog JXNcbiIsIGNvbW1hbmQpOwpAQCAtMTc4MywxMSArMTc4Myw3MCBAQCBzdGF0aWMgdm9pZCBnY29u Zl9jYWxsYmFjayhHQ29uZkNsaWVudCAqCiAJCWF1dG9fYXV0aG9yaXplID0gZ2NvbmZfdmFsdWVf Z2V0X2Jvb2wodmFsdWUpOwogfQogCitzdGF0aWMgREJ1c0dDb25uZWN0aW9uICpyZWdpc3Rlcl9p bnN0YW5jZSAoaW50ICpyZXR2YWwsIGdib29sZWFuIHNpbmdsZXRvbikKK3sKKwlEQnVzR0Nvbm5l Y3Rpb24gKnNjOworCURCdXNHUHJveHkgKnByb3h5OworCUdFcnJvciAqZXJyb3IgPSBOVUxMOwor CWd1aW50IHJlcXVlc3RfcmVzdWx0OworCWdib29sZWFuIHJldDsKKworCXNjID0gZGJ1c19nX2J1 c19nZXQoREJVU19CVVNfU0VTU0lPTiwgJmVycm9yKTsKKwlpZiAoZXJyb3IgIT0gTlVMTCkgewor CQlnX3ByaW50ZXJyKCJDb25uZWN0aW5nIHRvIHNlc3Npb24gYnVzIGZhaWxlZDogJXNcbiIsCisJ CQkJCWVycm9yLT5tZXNzYWdlKTsKKwkJZ19lcnJvcl9mcmVlKGVycm9yKTsKKwkJKnJldHZhbCA9 IDE7CisJCXJldHVybiBOVUxMOworCX0KKworCXByb3h5ID0gZGJ1c19nX3Byb3h5X25ld19mb3Jf bmFtZShzYywKKwkJCQkJCQkJCSAgREJVU19TRVJWSUNFX0RCVVMsCisJCQkJCQkJCQkgIERCVVNf UEFUSF9EQlVTLAorCQkJCQkJCQkJICBEQlVTX0lOVEVSRkFDRV9EQlVTKTsKKworCXJldCA9IGRi dXNfZ19wcm94eV9jYWxsKHByb3h5LCAiUmVxdWVzdE5hbWUiLCBOVUxMLAorCQkJCQkJCUdfVFlQ RV9TVFJJTkcsICJvcmcuYmx1ZXouR25vbWVBcHBsZXQiLAorCQkJCQkJCUdfVFlQRV9VSU5ULCAw LAorCQkJCQkJCUdfVFlQRV9JTlZBTElELAorCQkJCQkJCUdfVFlQRV9VSU5ULCAmcmVxdWVzdF9y ZXN1bHQsCisJCQkJCQkJR19UWVBFX0lOVkFMSUQpOworCWdfb2JqZWN0X3VucmVmKEdfT0JKRUNU KHByb3h5KSk7CisJaWYgKCFyZXQpIHsKKwkJZ19wcmludGVycigiRmFpbGVkIHRvIHJlcXVlc3Qg bmFtZSBvbiB0aGUgc2Vzc2lvbiBidXNcbiIpOworCQlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihz Yyk7CisJCSpyZXR2YWwgPSAxOworCQlyZXR1cm4gTlVMTDsKKwl9CisKKwlpZiAocmVxdWVzdF9y ZXN1bHQgIT0gREJVU19SRVFVRVNUX05BTUVfUkVQTFlfUFJJTUFSWV9PV05FUikgeworCQkqcmV0 dmFsID0gMDsKKwkJCisJCWlmIChzaW5nbGV0b24pIHsKKwkJCWdfcHJpbnQoIkFub3RoZXIgaW5z dGFuY2UgaXMgYWxyZWFkeSBydW5uaW5nLlxuIik7CisJCQlkYnVzX2dfY29ubmVjdGlvbl91bnJl ZihzYyk7CisJCQlyZXR1cm4gTlVMTDsKKwkJfQorCX0KKworCXJldHVybiBzYzsKK30KKwogaW50 IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIHsKKwlHT3B0aW9uQ29udGV4dCAqY3R4Owog CUd0a1dpZGdldCAqbWVudTsKIAlHRXJyb3IgKmVycm9yID0gTlVMTDsKKwlEQnVzR0Nvbm5lY3Rp b24gKnNlc3Npb25fY29ubiA9IE5VTEw7CiAJY2hhciAqc3RyOworCWludCByZXR2YWwgPSAwOwor CWdib29sZWFuIHNpbmdsZXRvbiA9IEZBTFNFOworCisJR09wdGlvbkVudHJ5IGVudHJpZXNbXSA9 IHsKKyAgICAgICAgeyAic2luZ2xldG9uIiwgMCwgMCwgR19PUFRJT05fQVJHX05PTkUsICZzaW5n bGV0b24sCisJCSAgTl8oIk9ubHkgYWxsb3cgb25lIGluc3RhbmNlIG9mIHRoaXMgYXBwbGljYXRp b24iKSwgTlVMTCB9LAorICAgICAgICB7IE5VTEwsIDAsIDAsIDAsIE5VTEwsIE5VTEwsIE5VTEwg fQorCX07CiAKIAliaW5kdGV4dGRvbWFpbihHRVRURVhUX1BBQ0tBR0UsIExPQ0FMRURJUik7CiAJ YmluZF90ZXh0ZG9tYWluX2NvZGVzZXQoR0VUVEVYVF9QQUNLQUdFLCAiVVRGLTgiKTsKQEAgLTE3 OTUsNiArMTg1NCwxNSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAJZ3Rr X2luaXQoJmFyZ2MsICZhcmd2KTsKIAorCWN0eCA9IGdfb3B0aW9uX2NvbnRleHRfbmV3KCIiKTsK KwlnX29wdGlvbl9jb250ZXh0X2FkZF9tYWluX2VudHJpZXMoY3R4LCBlbnRyaWVzLCBOVUxMKTsK KwlpZiAoIWdfb3B0aW9uX2NvbnRleHRfcGFyc2UoY3R4LCAmYXJnYywgJmFyZ3YsICZlcnJvcikp IHsKKwkJZ19wcmludGVycihfKCJwYXJzaW5nIGZhaWxlZDogJXNcbiIpLCBlcnJvci0+bWVzc2Fn ZSk7CisJCWdfZXJyb3JfZnJlZShlcnJvcik7CisJCWdfb3B0aW9uX2NvbnRleHRfZnJlZShjdHgp OworCQlyZXR1cm4gcmV0dmFsOworCX0KKwogI2lmZGVmIEhBVkVfTElCTk9USUZZCiAJbm90aWZ5 X2luaXQoImJsdWV0b290aC1tYW5hZ2VyIik7CiAjZW5kaWYKQEAgLTE4MDYsNiArMTg3NCwxMCBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQlnX2Vycm9yX2ZyZWUoZXJyb3Ip OwogCQlleGl0KEVYSVRfRkFJTFVSRSk7CiAJfQorCQorCXNlc3Npb25fY29ubiA9IHJlZ2lzdGVy X2luc3RhbmNlKCZyZXR2YWwsIHNpbmdsZXRvbik7CisJaWYgKCFzZXNzaW9uX2Nvbm4pCisJCWV4 aXQocmV0dmFsKTsKIAogCWdjb25mID0gZ2NvbmZfY2xpZW50X2dldF9kZWZhdWx0KCk7CiAKQEAg LTE4NjMsNiArMTkzNSw5IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJZ19s aXN0X2ZvcmVhY2goYWRhcHRlcl9saXN0LCBhZGFwdGVyX2ZyZWUsIE5VTEwpOwogCiAJZGJ1c19n X2Nvbm5lY3Rpb25fdW5yZWYoY29ubik7CisJZGJ1c19nX2Nvbm5lY3Rpb25fdW5yZWYoc2Vzc2lv bl9jb25uKTsKIAorCWdfb3B0aW9uX2NvbnRleHRfZnJlZShjdHgpOworCQogCXJldHVybiAwOwog fQpJbmRleDogcHJvcGVydGllcy9tYWluLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3Qv Ymx1ZXovZ25vbWUvcHJvcGVydGllcy9tYWluLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDgK ZGlmZiAtdSAtcCAtcjEuNDggbWFpbi5jCi0tLSBwcm9wZXJ0aWVzL21haW4uYwkzMSBKdWwgMjAw NyAyMTozNzoyOSAtMDAwMAkxLjQ4CisrKyBwcm9wZXJ0aWVzL21haW4uYwkxMyBOb3YgMjAwNyAx NzowNDoxNiAtMDAwMApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgPHN0cmluZy5oPgogCiAj aW5jbHVkZSA8ZGJ1cy9kYnVzLWdsaWIuaD4KKyNpbmNsdWRlIDxkYnVzL2RidXMtZ2xpYi1sb3ds ZXZlbC5oPgogCiAjaW5jbHVkZSA8Z2xpYi9naTE4bi5oPgogCkBAIC00MSw2ICs0Miw5IEBACiAj aW5jbHVkZSAic2VydmljZS5oIgogI2luY2x1ZGUgImFkYXB0ZXIuaCIKIAorI2RlZmluZSBQUk9Q RVJUSUVTX0RCVVNfUEFUSCAiL29yZy9ibHVlei9Hbm9tZVByb3BlcnRpZXMiCisjZGVmaW5lIFBS T1BFUlRJRVNfREJVU19TRVJWSUNFICJvcmcuYmx1ZXouR25vbWVQcm9wZXJ0aWVzIgorCiBzdGF0 aWMgdm9pZCBkZWxldGVfY2FsbGJhY2soR3RrV2lkZ2V0ICp3aW5kb3csIEdka0V2ZW50ICpldmVu dCwKIAkJCQkJCWdwb2ludGVyIHVzZXJfZGF0YSkKIHsKQEAgLTU4LDcgKzYyLDcgQEAgc3RhdGlj IHZvaWQgY2xvc2VfY2FsbGJhY2soR3RrV2lkZ2V0ICpidQogCWd0a19tYWluX3F1aXQoKTsKIH0K IAotc3RhdGljIHZvaWQgY3JlYXRlX3dpbmRvdyhHdGtXaWRnZXQgKm5vdGVib29rKQorc3RhdGlj IEd0a1dpZGdldCAqY3JlYXRlX3dpbmRvdyhHdGtXaWRnZXQgKm5vdGVib29rKQogewogCUd0a1dp ZGdldCAqd2luZG93OwogCUd0a1dpZGdldCAqd2lkZ2V0OwpAQCAtMTA4LDYgKzExMiw3IEBAIHN0 YXRpYyB2b2lkIGNyZWF0ZV93aW5kb3coR3RrV2lkZ2V0ICpub3QKIAkJCQkJCXdpZGdldCwgXygi R2VuZXJhbCIpKTsKIAogCWd0a193aWRnZXRfc2hvd19hbGwod2luZG93KTsKKwlyZXR1cm4gd2lu ZG93OwogfQogCiBzdGF0aWMgdm9pZCBuYW1lX293bmVyX2NoYW5nZWQoREJ1c0dQcm94eSAqb2Jq ZWN0LCBjb25zdCBjaGFyICpuYW1lLApAQCAtMTM5LDE5ICsxNDQsMTA1IEBAIHN0YXRpYyBEQnVz R1Byb3h5ICpzZXR1cF9tYW5hZ2VyKERCdXNHQ28KIAlyZXR1cm4gcHJveHk7CiB9CiAKK3N0YXRp YyBEQnVzSGFuZGxlclJlc3VsdCBNZXNzYWdlRnVuYyAoREJ1c0Nvbm5lY3Rpb24gKmMsIERCdXNN ZXNzYWdlICptLCB2b2lkICp1c2VyX2RhdGEpCit7CisJaWYgKGRidXNfbWVzc2FnZV9nZXRfdHlw ZShtKSA9PSBEQlVTX01FU1NBR0VfVFlQRV9NRVRIT0RfQ0FMTCAmJgorCQkhc3RybmNtcChQUk9Q RVJUSUVTX0RCVVNfUEFUSCwgZGJ1c19tZXNzYWdlX2dldF9wYXRoKG0pLCBzdHJsZW4oUFJPUEVS VElFU19EQlVTX1BBVEgpKSAmJgorCQkhc3RybmNtcChQUk9QRVJUSUVTX0RCVVNfU0VSVklDRSwg ZGJ1c19tZXNzYWdlX2dldF9pbnRlcmZhY2UobSksIHN0cmxlbihQUk9QRVJUSUVTX0RCVVNfU0VS VklDRSkpICYmCisJCSFzdHJuY21wKCJQcmVzZW50IiwgZGJ1c19tZXNzYWdlX2dldF9tZW1iZXIo bSksIDcpKSB7CisJCUd0a1dpbmRvdyAqd2luZG93ID0gdXNlcl9kYXRhOworCQlndGtfd2luZG93 X3ByZXNlbnQod2luZG93KTsKKwl9CisKKwlyZXR1cm4gREJVU19IQU5ETEVSX1JFU1VMVF9IQU5E TEVEOworfQorCitzdGF0aWMgREJ1c0dDb25uZWN0aW9uICpyZWdpc3Rlcl9pbnN0YW5jZSAoaW50 ICpyZXR2YWwsIGdib29sZWFuIHNpbmdsZXRvbikKK3sKKwlEQnVzR0Nvbm5lY3Rpb24gKnNjOwor CURCdXNHUHJveHkgKnByb3h5OworCUdFcnJvciAqZXJyb3IgPSBOVUxMOworCWd1aW50IHJlcXVl c3RfcmVzdWx0OworCWdib29sZWFuIHJldDsKKworCXNjID0gZGJ1c19nX2J1c19nZXQoREJVU19C VVNfU0VTU0lPTiwgJmVycm9yKTsKKwlpZiAoZXJyb3IgIT0gTlVMTCkgeworCQlnX3ByaW50ZXJy KCJDb25uZWN0aW5nIHRvIHNlc3Npb24gYnVzIGZhaWxlZDogJXNcbiIsCisJCQkJCWVycm9yLT5t ZXNzYWdlKTsKKwkJZ19lcnJvcl9mcmVlKGVycm9yKTsKKwkJKnJldHZhbCA9IDE7CisJCXJldHVy biBOVUxMOworCX0KKworCXByb3h5ID0gZGJ1c19nX3Byb3h5X25ld19mb3JfbmFtZShzYywKKwkJ CQkJCQkJCSAgREJVU19TRVJWSUNFX0RCVVMsCisJCQkJCQkJCQkgIERCVVNfUEFUSF9EQlVTLAor CQkJCQkJCQkJICBEQlVTX0lOVEVSRkFDRV9EQlVTKTsKKworCXJldCA9IGRidXNfZ19wcm94eV9j YWxsKHByb3h5LCAiUmVxdWVzdE5hbWUiLCBOVUxMLAorCQkJCQkJCUdfVFlQRV9TVFJJTkcsIFBS T1BFUlRJRVNfREJVU19TRVJWSUNFLAorCQkJCQkJCUdfVFlQRV9VSU5ULCAwLAorCQkJCQkJCUdf VFlQRV9JTlZBTElELAorCQkJCQkJCUdfVFlQRV9VSU5ULCAmcmVxdWVzdF9yZXN1bHQsCisJCQkJ CQkJR19UWVBFX0lOVkFMSUQpOworCWdfb2JqZWN0X3VucmVmKEdfT0JKRUNUKHByb3h5KSk7CisJ aWYgKCFyZXQpIHsKKwkJZ19wcmludGVycigiRmFpbGVkIHRvIHJlcXVlc3QgbmFtZSBvbiB0aGUg c2Vzc2lvbiBidXNcbiIpOworCQlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihzYyk7CisJCSpyZXR2 YWwgPSAxOworCQlyZXR1cm4gTlVMTDsKKwl9CisKKwlpZiAocmVxdWVzdF9yZXN1bHQgIT0gREJV U19SRVFVRVNUX05BTUVfUkVQTFlfUFJJTUFSWV9PV05FUiAmJiBzaW5nbGV0b24pIHsKKwkJcHJv eHkgPSBkYnVzX2dfcHJveHlfbmV3X2Zvcl9uYW1lKHNjLAorCQkJCQkJCQkJCSAgUFJPUEVSVElF U19EQlVTX1NFUlZJQ0UsCisJCQkJCQkJCQkJICBQUk9QRVJUSUVTX0RCVVNfUEFUSCwKKwkJCQkJ CQkJCQkgIFBST1BFUlRJRVNfREJVU19TRVJWSUNFKTsKKwkJZGJ1c19nX3Byb3h5X2NhbGxfbm9f cmVwbHkocHJveHksICJQcmVzZW50IiwgR19UWVBFX0lOVkFMSUQsIEdfVFlQRV9JTlZBTElEKTsK KwkJZ19vYmplY3RfdW5yZWYoR19PQkpFQ1QocHJveHkpKTsKKwkJKnJldHZhbCA9IDA7CisJCisJ CWdfcHJpbnQoIkFub3RoZXIgaW5zdGFuY2UgaXMgYWxyZWFkeSBydW5uaW5nLlxuIik7CisJCWRi dXNfZ19jb25uZWN0aW9uX3VucmVmKHNjKTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisJcmV0dXJu IHNjOworfQorCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogeworCUdPcHRpb25D b250ZXh0ICpjdHg7CiAJR3RrV2lkZ2V0ICpub3RlYm9vazsKLQlEQnVzR0Nvbm5lY3Rpb24gKmNv bm47Ci0JREJ1c0dQcm94eSAqbWFuYWdlcjsKKwlHdGtXaWRnZXQgKndpbmRvdzsKIAlHRXJyb3Ig KmVycm9yID0gTlVMTDsKLQorCURCdXNHQ29ubmVjdGlvbiAqY29ubiwgKnNlc3Npb25fY29ubiA9 IE5VTEw7CisJREJ1c0dQcm94eSAqbWFuYWdlcjsKKwlEQnVzT2JqZWN0UGF0aFZUYWJsZSB2dGFi bGU7CisJaW50IHJldHZhbCA9IDA7CisJZ2Jvb2xlYW4gc2luZ2xldG9uID0gRkFMU0U7CisKKwlH T3B0aW9uRW50cnkgZW50cmllc1tdID0geworICAgICAgICB7ICJzaW5nbGV0b24iLCAwLCAwLCBH X09QVElPTl9BUkdfTk9ORSwgJnNpbmdsZXRvbiwKKwkJICBOXygiT25seSBhbGxvdyBvbmUgaW5z dGFuY2Ugb2YgdGhpcyBhcHBsaWNhdGlvbiIpLCBOVUxMIH0sCisgICAgICAgIHsgTlVMTCwgMCwg MCwgMCwgTlVMTCwgTlVMTCwgTlVMTCB9CisJfTsKKwkKIAliaW5kdGV4dGRvbWFpbihHRVRURVhU X1BBQ0tBR0UsIExPQ0FMRURJUik7CiAJYmluZF90ZXh0ZG9tYWluX2NvZGVzZXQoR0VUVEVYVF9Q QUNLQUdFLCAiVVRGLTgiKTsKIAl0ZXh0ZG9tYWluKEdFVFRFWFRfUEFDS0FHRSk7CiAKIAlndGtf aW5pdCgmYXJnYywgJmFyZ3YpOwogCisJY3R4ID0gZ19vcHRpb25fY29udGV4dF9uZXcoIiIpOwor CWdfb3B0aW9uX2NvbnRleHRfYWRkX21haW5fZW50cmllcyhjdHgsIGVudHJpZXMsIE5VTEwpOwor CWlmICghZ19vcHRpb25fY29udGV4dF9wYXJzZShjdHgsICZhcmdjLCAmYXJndiwgJmVycm9yKSkg eworCQlnX3ByaW50ZXJyKF8oInBhcnNpbmcgZmFpbGVkOiAlc1xuIiksIGVycm9yLT5tZXNzYWdl KTsKKwkJZ19lcnJvcl9mcmVlKGVycm9yKTsKKwkJZ19vcHRpb25fY29udGV4dF9mcmVlKGN0eCk7 CisJCXJldHVybiByZXR2YWw7CisJfQorCQogCWNvbm4gPSBkYnVzX2dfYnVzX2dldChEQlVTX0JV U19TWVNURU0sICZlcnJvcik7CiAJaWYgKGVycm9yICE9IE5VTEwpIHsKIAkJZ19wcmludGVycigi Q29ubmVjdGluZyB0byBzeXN0ZW0gYnVzIGZhaWxlZDogJXNcbiIsCkBAIC0xNjAsMTUgKzI1MSwy NCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQlleGl0KEVYSVRfRkFJTFVS RSk7CiAJfQogCisJc2Vzc2lvbl9jb25uID0gcmVnaXN0ZXJfaW5zdGFuY2UoJnJldHZhbCwgc2lu Z2xldG9uKTsKKwlpZiAoIXNlc3Npb25fY29ubikKKwkJZXhpdChyZXR2YWwpOworCiAJc2V0dXBf Z2VuZXJhbCgpOwogCiAJbm90ZWJvb2sgPSBndGtfbm90ZWJvb2tfbmV3KCk7Ci0KKyAgICAKIAlh c3NpZ25fYWRhcHRlcihub3RlYm9vayk7CiAKIAltYW5hZ2VyID0gc2V0dXBfbWFuYWdlcihjb25u KTsKIAotCWNyZWF0ZV93aW5kb3cobm90ZWJvb2spOworCXdpbmRvdyA9IGNyZWF0ZV93aW5kb3co bm90ZWJvb2spOworCisJdnRhYmxlLm1lc3NhZ2VfZnVuY3Rpb24gPSBNZXNzYWdlRnVuYzsKKwl2 dGFibGUudW5yZWdpc3Rlcl9mdW5jdGlvbiA9IE5VTEw7CisJZGJ1c19jb25uZWN0aW9uX3JlZ2lz dGVyX29iamVjdF9wYXRoKGRidXNfZ19jb25uZWN0aW9uX2dldF9jb25uZWN0aW9uIChzZXNzaW9u X2Nvbm4pLAorCQkJCQkJCQkJCSAiL29yZy9ibHVlei9Hbm9tZVByb3BlcnRpZXMiLCAmdnRhYmxl LCB3aW5kb3cpOwogCiAJZ3RrX21haW4oKTsKIApAQCAtMTgxLDYgKzI4MSw5IEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJZ19vYmplY3RfdW5yZWYobWFuYWdlcik7CiAKIAlk YnVzX2dfY29ubmVjdGlvbl91bnJlZihjb25uKTsKKwlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihz ZXNzaW9uX2Nvbm4pOwogCisJZ19vcHRpb25fY29udGV4dF9mcmVlKGN0eCk7CisJCiAJcmV0dXJu IDA7CiB9CkluZGV4OiB3aXphcmQvbWFpbi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290 L2JsdWV6L2dub21lL3dpemFyZC9tYWluLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjMKZGlm ZiAtdSAtcCAtcjEuMjMgbWFpbi5jCi0tLSB3aXphcmQvbWFpbi5jCTE1IEF1ZyAyMDA3IDA3OjA0 OjAzIC0wMDAwCTEuMjMKKysrIHdpemFyZC9tYWluLmMJMTMgTm92IDIwMDcgMTc6MDQ6MTYgLTAw MDAKQEAgLTI2LDggKzI2LDEwIEBACiAjZW5kaWYKIAogI2luY2x1ZGUgPHN0cmluZy5oPgorI2lu Y2x1ZGUgPHN0ZGxpYi5oPgogCiAjaW5jbHVkZSA8ZGJ1cy9kYnVzLWdsaWIuaD4KKyNpbmNsdWRl IDxkYnVzL2RidXMtZ2xpYi1sb3dsZXZlbC5oPgogCiAjaW5jbHVkZSA8Z2xpYi9naTE4bi5oPgog CkBAIC0zOSw2ICs0MSw5IEBACiAKICNpbmNsdWRlICJibHVldG9vdGgtZGV2aWNlLXNlbGVjdGlv bi5oIgogCisjZGVmaW5lIFdJWkFSRF9EQlVTX1BBVEggIi9vcmcvYmx1ZXovR25vbWVXaXphcmQi CisjZGVmaW5lIFdJWkFSRF9EQlVTX1NFUlZJQ0UgIm9yZy5ibHVlei5Hbm9tZVdpemFyZCIKKwog c3RhdGljIEJsdWV0b290aENsaWVudCAqY2xpZW50OwogCiBzdGF0aWMgZ2NoYXIgKmFkZHJlc3Mg PSBOVUxMOwpAQCAtMzg3LDcgKzM5Miw3IEBAIHN0YXRpYyB2b2lkIGNyZWF0ZV9zdW1tYXJ5KEd0 a1dpZGdldCAqYXMKIAlwYWdlX3N1bW1hcnkgPSB2Ym94OwogfQogCi1zdGF0aWMgdm9pZCBjcmVh dGVfd2l6YXJkKHZvaWQpCitzdGF0aWMgR3RrV2lkZ2V0ICpjcmVhdGVfd2l6YXJkKHZvaWQpCiB7 CiAJR3RrV2lkZ2V0ICphc3Npc3RhbnQ7CiAKQEAgLTQzMCwyMyArNDM1LDEyNiBAQCBzdGF0aWMg dm9pZCBjcmVhdGVfd2l6YXJkKHZvaWQpCiAJZ3RrX3dpZGdldF9zaG93X2FsbChhc3Npc3RhbnQp OwogCiAJZ3RrX2Fzc2lzdGFudF91cGRhdGVfYnV0dG9uc19zdGF0ZShHVEtfQVNTSVNUQU5UKGFz c2lzdGFudCkpOworCXJldHVybiBhc3Npc3RhbnQ7Cit9CisKK3N0YXRpYyBEQnVzSGFuZGxlclJl c3VsdCBNZXNzYWdlRnVuYyAoREJ1c0Nvbm5lY3Rpb24gKmMsIERCdXNNZXNzYWdlICptLCB2b2lk ICp1c2VyX2RhdGEpCit7CisJaWYgKGRidXNfbWVzc2FnZV9nZXRfdHlwZShtKSA9PSBEQlVTX01F U1NBR0VfVFlQRV9NRVRIT0RfQ0FMTCAmJgorCQkhc3RybmNtcChXSVpBUkRfREJVU19QQVRILCBk YnVzX21lc3NhZ2VfZ2V0X3BhdGgobSksIHN0cmxlbihXSVpBUkRfREJVU19QQVRIKSkgJiYKKwkJ IXN0cm5jbXAoV0laQVJEX0RCVVNfU0VSVklDRSwgZGJ1c19tZXNzYWdlX2dldF9pbnRlcmZhY2Uo bSksIHN0cmxlbihXSVpBUkRfREJVU19TRVJWSUNFKSkgJiYKKwkJIXN0cm5jbXAoIlByZXNlbnQi LCBkYnVzX21lc3NhZ2VfZ2V0X21lbWJlcihtKSwgNykpIHsKKwkJR3RrV2luZG93ICp3aW5kb3cg PSB1c2VyX2RhdGE7CisJCWd0a193aW5kb3dfcHJlc2VudCh3aW5kb3cpOworCX0KKworCXJldHVy biBEQlVTX0hBTkRMRVJfUkVTVUxUX0hBTkRMRUQ7Cit9CisKK3N0YXRpYyBEQnVzR0Nvbm5lY3Rp b24gKnJlZ2lzdGVyX2luc3RhbmNlIChpbnQgKnJldHZhbCwgZ2Jvb2xlYW4gc2luZ2xldG9uKQor eworCURCdXNHQ29ubmVjdGlvbiAqc2M7CisJREJ1c0dQcm94eSAqcHJveHk7CisJR0Vycm9yICpl cnJvciA9IE5VTEw7CisJZ3VpbnQgcmVxdWVzdF9yZXN1bHQ7CisJZ2Jvb2xlYW4gcmV0OworCisJ c2MgPSBkYnVzX2dfYnVzX2dldChEQlVTX0JVU19TRVNTSU9OLCAmZXJyb3IpOworCWlmIChlcnJv ciAhPSBOVUxMKSB7CisJCWdfcHJpbnRlcnIoIkNvbm5lY3RpbmcgdG8gc2Vzc2lvbiBidXMgZmFp bGVkOiAlc1xuIiwKKwkJCQkJZXJyb3ItPm1lc3NhZ2UpOworCQlnX2Vycm9yX2ZyZWUoZXJyb3Ip OworCQkqcmV0dmFsID0gMTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisJcHJveHkgPSBkYnVzX2df cHJveHlfbmV3X2Zvcl9uYW1lKHNjLAorCQkJCQkJCQkJICBEQlVTX1NFUlZJQ0VfREJVUywKKwkJ CQkJCQkJCSAgREJVU19QQVRIX0RCVVMsCisJCQkJCQkJCQkgIERCVVNfSU5URVJGQUNFX0RCVVMp OworCisJcmV0ID0gZGJ1c19nX3Byb3h5X2NhbGwocHJveHksICJSZXF1ZXN0TmFtZSIsIE5VTEws CisJCQkJCQkJR19UWVBFX1NUUklORywgV0laQVJEX0RCVVNfU0VSVklDRSwKKwkJCQkJCQlHX1RZ UEVfVUlOVCwgMCwKKwkJCQkJCQlHX1RZUEVfSU5WQUxJRCwKKwkJCQkJCQlHX1RZUEVfVUlOVCwg JnJlcXVlc3RfcmVzdWx0LAorCQkJCQkJCUdfVFlQRV9JTlZBTElEKTsKKwlnX29iamVjdF91bnJl ZihHX09CSkVDVChwcm94eSkpOworCWlmICghcmV0KSB7CisJCWdfcHJpbnRlcnIoIkZhaWxlZCB0 byByZXF1ZXN0IG5hbWUgb24gdGhlIHNlc3Npb24gYnVzXG4iKTsKKwkJZGJ1c19nX2Nvbm5lY3Rp b25fdW5yZWYoc2MpOworCQkqcmV0dmFsID0gMTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisJaWYg KHJlcXVlc3RfcmVzdWx0ICE9IERCVVNfUkVRVUVTVF9OQU1FX1JFUExZX1BSSU1BUllfT1dORVIg JiYgc2luZ2xldG9uKSB7CisJCXByb3h5ID0gZGJ1c19nX3Byb3h5X25ld19mb3JfbmFtZShzYywK KwkJCQkJCQkJCQkgIFdJWkFSRF9EQlVTX1NFUlZJQ0UsCisJCQkJCQkJCQkJICBXSVpBUkRfREJV U19QQVRILAorCQkJCQkJCQkJCSAgV0laQVJEX0RCVVNfU0VSVklDRSk7CisJCWRidXNfZ19wcm94 eV9jYWxsX25vX3JlcGx5KHByb3h5LCAiUHJlc2VudCIsIEdfVFlQRV9JTlZBTElELCBHX1RZUEVf SU5WQUxJRCk7CisJCWdfb2JqZWN0X3VucmVmKEdfT0JKRUNUKHByb3h5KSk7CisJCSpyZXR2YWwg PSAwOworCQkKKwkJZ19wcmludCgiQW5vdGhlciBpbnN0YW5jZSBpcyBhbHJlYWR5IHJ1bm5pbmcu XG4iKTsKKwkJZGJ1c19nX2Nvbm5lY3Rpb25fdW5yZWYoc2MpOworCQlyZXR1cm4gTlVMTDsKKwl9 CisKKwlyZXR1cm4gc2M7CiB9CiAKIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiB7 CisJR09wdGlvbkNvbnRleHQgKmN0eDsKKwlHdGtXaWRnZXQgKndpbmRvdzsKKwlEQnVzR0Nvbm5l Y3Rpb24gKnNlc3Npb25fY29ubiA9IE5VTEw7CisJR0Vycm9yICplcnJvciA9IE5VTEw7CisJREJ1 c09iamVjdFBhdGhWVGFibGUgdnRhYmxlOworCWludCByZXR2YWwgPSAwOworCWdib29sZWFuIHNp bmdsZXRvbiA9IEZBTFNFOworCisJR09wdGlvbkVudHJ5IGVudHJpZXNbXSA9IHsKKyAgICAgICAg eyAic2luZ2xldG9uIiwgMCwgMCwgR19PUFRJT05fQVJHX05PTkUsICZzaW5nbGV0b24sCisJCSAg Tl8oIk9ubHkgYWxsb3cgb25lIGluc3RhbmNlIG9mIHRoaXMgYXBwbGljYXRpb24iKSwgTlVMTCB9 LAorICAgICAgICB7IE5VTEwsIDAsIDAsIDAsIE5VTEwsIE5VTEwsIE5VTEwgfQorCX07CisJCiAJ YmluZHRleHRkb21haW4oR0VUVEVYVF9QQUNLQUdFLCBMT0NBTEVESVIpOwogCWJpbmRfdGV4dGRv bWFpbl9jb2Rlc2V0KEdFVFRFWFRfUEFDS0FHRSwgIlVURi04Iik7CiAJdGV4dGRvbWFpbihHRVRU RVhUX1BBQ0tBR0UpOwogCiAJZ3RrX2luaXQoJmFyZ2MsICZhcmd2KTsKIAorCWN0eCA9IGdfb3B0 aW9uX2NvbnRleHRfbmV3KCIiKTsKKwlnX29wdGlvbl9jb250ZXh0X2FkZF9tYWluX2VudHJpZXMo Y3R4LCBlbnRyaWVzLCBOVUxMKTsKKwlpZiAoIWdfb3B0aW9uX2NvbnRleHRfcGFyc2UoY3R4LCAm YXJnYywgJmFyZ3YsICZlcnJvcikpIHsKKwkJZ19wcmludGVycihfKCJwYXJzaW5nIGZhaWxlZDog JXNcbiIpLCBlcnJvci0+bWVzc2FnZSk7CisJCWdfZXJyb3JfZnJlZShlcnJvcik7CisJCWdfb3B0 aW9uX2NvbnRleHRfZnJlZShjdHgpOworCQlyZXR1cm4gcmV0dmFsOworCX0KKwkKKwlzZXNzaW9u X2Nvbm4gPSByZWdpc3Rlcl9pbnN0YW5jZSgmcmV0dmFsLCBzaW5nbGV0b24pOworCWlmICghc2Vz c2lvbl9jb25uKQorCQlleGl0KHJldHZhbCk7CisKIAljbGllbnQgPSBibHVldG9vdGhfY2xpZW50 X25ldygpOwogCi0JY3JlYXRlX3dpemFyZCgpOworCXdpbmRvdyA9IGNyZWF0ZV93aXphcmQoKTsK KyAgICAKKwl2dGFibGUubWVzc2FnZV9mdW5jdGlvbiA9IE1lc3NhZ2VGdW5jOworCXZ0YWJsZS51 bnJlZ2lzdGVyX2Z1bmN0aW9uID0gTlVMTDsKKwlkYnVzX2Nvbm5lY3Rpb25fcmVnaXN0ZXJfb2Jq ZWN0X3BhdGgoZGJ1c19nX2Nvbm5lY3Rpb25fZ2V0X2Nvbm5lY3Rpb24gKHNlc3Npb25fY29ubiks CisJCQkJCQkJCQkJIFdJWkFSRF9EQlVTX1BBVEgsICZ2dGFibGUsIHdpbmRvdyk7CiAKIAlndGtf bWFpbigpOwogCiAJZ19vYmplY3RfdW5yZWYoY2xpZW50KTsKIAorCWRidXNfZ19jb25uZWN0aW9u X3VucmVmKHNlc3Npb25fY29ubik7CisKKwlnX29wdGlvbl9jb250ZXh0X2ZyZWUoY3R4KTsKKwkK IAlyZXR1cm4gMDsKIH0K ------=_Part_15575_19654844.1194973578325 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ------=_Part_15575_19654844.1194973578325 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Bluez-devel mailing list Bluez-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bluez-devel ------=_Part_15575_19654844.1194973578325--