ebnc
"A. Craig West" <[email protected]> Thu, 13 May 2004 16:42:17 -0400 (EDT)
| Newsgroups | gmane.network.everybuddy.devel |
|---|---|
| Message-ID | <[email protected]> |
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 [email protected] for more info. ---1463811291-1988820259-1084480937=:21935 Content-Type: TEXT/PLAIN; charset=US-ASCII I was a bad programmer, and duplicated effort... I ended up implementing status messages in ebnc even though I knew Karine was working on it too. My only defence is that it happened to fix a bug I have been having with the show online contacts only code... I've attached a patch, relative to the current head of subversion... -- Craig West Ph: (416) 666-1645 | It's not a bug, [email protected] | It's a feature... ---1463811291-1988820259-1084480937=:21935 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="ebnc.patch" Content-Transfer-Encoding: BASE64 Content-ID: <[email protected]> Content-Description: ebnc console-mode gui for eb-lite patch Content-Disposition: attachment; filename="ebnc.patch" SW5kZXg6IGVibmMvZ3JvdXAuaA0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K LS0tIGVibmMvZ3JvdXAuaAkocmV2aXNpb24gMzU3KQ0KKysrIGVibmMvZ3Jv dXAuaAkod29ya2luZyBjb3B5KQ0KQEAgLTM0LDggKzM0LDggQEANCiAgIGJv b2wgaXNMb2dnZWQoKSBjb25zdDsNCiAgIENvbnRhY3QgKmdldENvbnRhY3Qo KSBjb25zdDsNCiAgIEdyb3VwICpnZXRHcm91cCgpIGNvbnN0Ow0KLSAgdm9p ZCBhd2F5KGNoYXIgKnN0YXR1c1N0cmluZyk7DQotICB2b2lkIGxvZ2luKGNo YXIgKnN0YXR1c1N0cmluZyk7DQorICB2b2lkIHVwZGF0ZVN0YXR1cyhpbnQg c3RhdHVzLCBjaGFyICpzdGF0dXNTdHJpbmcpOw0KKyAgdm9pZCBsb2dpbigp Ow0KICAgdm9pZCBsb2dvdXQoKTsNCiAgIHZvaWQgc2V0Q29udGFjdChDb250 YWN0ICpjKTsNCiAgcHJpdmF0ZToNCkBAIC03NCwxMyArNzQsMTcgQEANCiAg IHZvaWQgbG9nb3V0KCk7DQogICB2b2lkIGFkZEFjY291bnQoQ29udGFjdEFj Y291bnQgKmNhKTsNCiAgIHZvaWQgc2V0R3JvdXAoR3JvdXAgKmcpOw0KKyAg Y2hhciAqZ2V0U3RhdHVzU3RyaW5nKCkgY29uc3Q7DQorICBpbnQgZ2V0U3Rh dHVzKCkgY29uc3Q7DQorICB2b2lkIHVwZGF0ZVN0YXR1cyhpbnQgc3RhdHVz LCBjaGFyICpzdGF0dXNTdHJpbmcpOw0KICBwcml2YXRlOg0KICAgY2hhciAq bmFtZTsNCi0gIGludCBsb2dnZWQ7DQogICBpbnQgaXNJZ25vcmVkOw0KICAg Y2hhciAqaWdub3JlTWVzc2FnZTsNCiAgIENvbnRhY3RBY2NvdW50TGlzdCAq Y29udGFjdEFjY291bnRzOw0KICAgR3JvdXAgKmdyb3VwOw0KKyAgY2hhciAq c3RhdHVzU3RyaW5nOw0KKyAgaW50IHN0YXR1czsNCiB9Ow0KIA0KIGNsYXNz IENvbnRhY3RMaXN0DQpJbmRleDogZWJuYy9lYm5jdXJzZXMuY3BwDQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQotLS0gZWJuYy9lYm5jdXJzZXMuY3BwCShy ZXZpc2lvbiAzNTcpDQorKysgZWJuYy9lYm5jdXJzZXMuY3BwCSh3b3JraW5n IGNvcHkpDQpAQCAtMzE4LDcgKzMxOCw3IEBADQogICAgIFNlcnZpY2UgKnNl cnZpY2UgPSBzZXJ2aWNlcy0+ZmluZChjb21tYW5kWzJdKTsNCiAgICAgTG9j YWxBY2NvdW50ICpsb2NhbEFjY291bnQgPSBsb2NhbEFjY291bnRzLT5maW5k KHNlcnZpY2UsIGNvbW1hbmRbMV0pOw0KICAgICBDb250YWN0QWNjb3VudCAq Y29udGFjdEFjY291bnQgPSBsb2NhbEFjY291bnQtPmZpbmRBY2NvdW50KGNv bW1hbmRbM10pOw0KLSAgICBjb250YWN0QWNjb3VudC0+bG9naW4oIiIpOw0K KyAgICBjb250YWN0QWNjb3VudC0+bG9naW4oKTsNCiAgICAgZ3VpLT51cGRh dGVDb250YWN0cygpOw0KICAgfQ0KICAgDQpAQCAtMzM2LDEwICszMzYsOSBA QA0KICAgICAgIGNvbnRhY3RBY2NvdW50LT5sb2dvdXQoKTsNCiAgICAgICBi cmVhazsNCiAgICAgY2FzZSAxOg0KLSAgICAgIGNvbnRhY3RBY2NvdW50LT5s b2dpbihjb21tYW5kWzVdKTsNCi0gICAgICBicmVhazsNCiAgICAgY2FzZSAy Og0KLSAgICAgIGNvbnRhY3RBY2NvdW50LT5hd2F5KGNvbW1hbmRbNV0pOw0K KyAgICBkZWZhdWx0Og0KKyAgICAgIGNvbnRhY3RBY2NvdW50LT51cGRhdGVT dGF0dXMoc3RhdGUsIGNvbW1hbmRbNV0pOw0KICAgICAgIGJyZWFrOw0KICAg ICB9DQogICAgIGd1aS0+dXBkYXRlQ29udGFjdHMoKTsNCkluZGV4OiBlYm5j L3dpbmRvd3MuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gZWJu Yy93aW5kb3dzLmNwcAkocmV2aXNpb24gMzU3KQ0KKysrIGVibmMvd2luZG93 cy5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC05MjUsMTQgKzkyNSwyNSBAQA0K IAkgICAgY29udGFjdHNXaW4tPmhpZ2hsaWdodENvbnRhY3RBY2NvdW50KE5V TEwpOw0KIAkgIH0NCiAJICB3YWRkc3RyKGNoYXRXSU4sICJcbiAgIik7DQot CSAgaWYgKCFzaG93T25saW5lT25seSkNCisJICBzd2l0Y2ggKGMtPmdldEZp cnN0KCktPmdldFN0YXR1cygpKQ0KIAkgIHsNCi0JICAgIGlmIChjLT5nZXRG aXJzdCgpLT5pc0xvZ2dlZCgpKQ0KLQkgICAgICB3YWRkc3RyKGNoYXRXSU4s ICJPICIpOw0KLQkgICAgZWxzZQ0KLQkgICAgICB3YWRkc3RyKGNoYXRXSU4s ICIuICIpOw0KKwkgIGNhc2UgMDoNCisJICAgIHdhZGRzdHIoY2hhdFdJTiwg Ii4gIik7DQorCSAgICBicmVhazsNCisJICBjYXNlIDE6DQorCSAgICB3YWRk c3RyKGNoYXRXSU4sICJPICIpOw0KKwkgICAgYnJlYWs7DQorCSAgY2FzZSAy Og0KKwkgICAgd2FkZHN0cihjaGF0V0lOLCAieCAiKTsNCisJICAgIGJyZWFr Ow0KIAkgIH0NCiAJICB3YWRkc3RyKGNoYXRXSU4sIGMtPmdldEZpcnN0KCkt PmdldE5hbWUoKSk7DQorCSAgaWYgKGMtPmdldEZpcnN0KCktPmdldFN0YXR1 c1N0cmluZygpICYmIHN0cmxlbihjLT5nZXRGaXJzdCgpLT5nZXRTdGF0dXNT dHJpbmcoKSkgPiAwKQ0KKwkgIHsNCisJICAgIHdhZGRzdHIoY2hhdFdJTiwg IiAoIik7DQorCSAgICB3YWRkc3RyKGNoYXRXSU4sIGMtPmdldEZpcnN0KCkt PmdldFN0YXR1c1N0cmluZygpKTsNCisJICAgIHdhZGRzdHIoY2hhdFdJTiwg IikiKTsNCisJICB9DQogCSAgaWYgKGxpbmUgPT0gY29udGFjdHNXaW4tPmdl dEhpZ2hsaWdodCgpKQ0KIAkgICAgd2F0dHJvZmYoY2hhdFdJTiwgQV9SRVZF UlNFKTsNCiAJfQ0KQEAgLTk2Nyw3ICs5NzgsNyBAQA0KIAkgICAgICBicmVh azsNCiAJICAgIH0NCiAJICAgIHdhZGRzdHIoY2hhdFdJTiwgY2EtPmdldEZp cnN0KCktPmdldE5hbWUoKSk7DQotCSAgICBpZiAoY2EtPmdldEZpcnN0KCkt PmdldFN0YXR1cygpID09IDIpDQorCSAgICBpZiAoY2EtPmdldEZpcnN0KCkt PmdldFN0YXR1c1N0cmluZygpICYmIHN0cmxlbihjYS0+Z2V0Rmlyc3QoKS0+ Z2V0U3RhdHVzU3RyaW5nKCkpID4gMCkNCiAJICAgIHsNCiAJICAgICAgd2Fk ZHN0cihjaGF0V0lOLCAiICgiKTsNCiAJICAgICAgd2FkZHN0cihjaGF0V0lO LCBjYS0+Z2V0Rmlyc3QoKS0+Z2V0U3RhdHVzU3RyaW5nKCkpOw0KSW5kZXg6 IGVibmMvZ3JvdXAuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g ZWJuYy9ncm91cC5jcHAJKHJldmlzaW9uIDM1NykNCisrKyBlYm5jL2dyb3Vw LmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTIzLDcgKzIzLDcgQEANCiBDb250 YWN0QWNjb3VudDo6Q29udGFjdEFjY291bnQoTG9jYWxBY2NvdW50ICpsb2Nh bEFjY291bnQsIGNoYXIgKm5hbWUsIGNoYXIgKmlzQmxvY2tlZCkNCiB7DQog ICB0aGlzLT5sb2NhbEFjY291bnQgPSBsb2NhbEFjY291bnQ7DQotICB0aGlz LT5uYW1lID0gc3RyZHVwKG5hbWUpOw0KKyAgdGhpcy0+bmFtZSA9IG5hbWUg PyBzdHJkdXAobmFtZSkgOiBOVUxMOw0KICAgc3RhdHVzU3RyaW5nID0gTlVM TDsNCiAgIGlmIChpc0Jsb2NrZWQgPT0gTlVMTCkNCiAgICAgdGhpcy0+aXNC bG9ja2VkID0gMDsNCkBAIC04NywyMiArODcsMjQgQEANCiAgIHJldHVybiBj b250YWN0LT5nZXRHcm91cCgpOw0KIH0NCiANCi12b2lkIENvbnRhY3RBY2Nv dW50Ojphd2F5KGNoYXIgKnN0YXR1c1N0cmluZykNCit2b2lkIENvbnRhY3RB Y2NvdW50Ojp1cGRhdGVTdGF0dXMoaW50IHN0YXR1cywgY2hhciAqc3RhdHVz U3RyaW5nKQ0KIHsNCi0gIHN0YXR1cyA9IDI7DQotICB0aGlzLT5zdGF0dXNT dHJpbmcgPSBzdHJkdXAoc3RhdHVzU3RyaW5nKTsNCisgIHRoaXMtPnN0YXR1 cyA9IHN0YXR1czsNCisgIGlmICh0aGlzLT5zdGF0dXNTdHJpbmcpDQorICAg IGZyZWUodGhpcy0+c3RhdHVzU3RyaW5nKTsNCisgIHRoaXMtPnN0YXR1c1N0 cmluZyA9IHN0YXR1c1N0cmluZyA/IHN0cmR1cChzdGF0dXNTdHJpbmcpOiBO VUxMOw0KKyAgY29udGFjdC0+dXBkYXRlU3RhdHVzKHN0YXR1cywgc3RhdHVz U3RyaW5nKTsNCiB9DQogDQotdm9pZCBDb250YWN0QWNjb3VudDo6bG9naW4o Y2hhciAqc3RhdHVzU3RyaW5nKQ0KK3ZvaWQgQ29udGFjdEFjY291bnQ6Omxv Z2luKCkNCiB7DQotICBzdGF0dXMgPSAxOw0KLSAgdGhpcy0+c3RhdHVzU3Ry aW5nID0gc3RyZHVwKHN0YXR1c1N0cmluZyk7DQogICBjb250YWN0LT5sb2dp bigpOw0KKyAgdXBkYXRlU3RhdHVzKDEsICIiKTsNCiB9DQogDQogdm9pZCBD b250YWN0QWNjb3VudDo6bG9nb3V0KCkNCiB7DQotICBzdGF0dXMgPSAwOw0K KyAgdXBkYXRlU3RhdHVzKDAsIE5VTEwpOw0KICAgY29udGFjdC0+bG9nb3V0 KCk7DQogfQ0KIA0KQEAgLTE1OCw4ICsxNjAsOSBAQA0KIA0KIENvbnRhY3Q6 OkNvbnRhY3QoY2hhciAqbmFtZSwgY2hhciAqaXNJZ25vcmVkLCBjaGFyICpp Z25vcmVNZXNzYWdlKQ0KIHsNCi0gIHRoaXMtPm5hbWUgPSBzdHJkdXAobmFt ZSk7DQotICBsb2dnZWQgPSAwOw0KKyAgdGhpcy0+bmFtZSA9IG5hbWUgPyBz dHJkdXAobmFtZSkgOiBOVUxMOw0KKyAgc3RhdHVzID0gMDsNCisgIHN0YXR1 c1N0cmluZyA9IE5VTEw7DQogICBpZiAoaXNJZ25vcmVkID09IE5VTEwpDQog ICAgIHRoaXMtPmlzSWdub3JlZCA9IDA7DQogICBlbHNlDQpAQCAtMTc2LDYg KzE3OSwxMSBAQA0KICAgICBmcmVlKG5hbWUpOw0KICAgICBuYW1lID0gTlVM TDsNCiAgIH0NCisgIGlmIChzdGF0dXNTdHJpbmcpDQorICB7DQorICAgIGZy ZWUoc3RhdHVzU3RyaW5nKTsNCisgICAgc3RhdHVzU3RyaW5nID0gTlVMTDsN CisgIH0NCiAgIGlmIChjb250YWN0QWNjb3VudHMpDQogICB7DQogICAgIGRl bGV0ZSBjb250YWN0QWNjb3VudHM7DQpAQCAtMTkwLDcgKzE5OCw3IEBADQog DQogYm9vbCBDb250YWN0Ojppc0xvZ2dlZCgpIGNvbnN0DQogew0KLSAgcmV0 dXJuIChsb2dnZWQgPiAwKTsNCisgIHJldHVybiAoc3RhdHVzID4gMCk7DQog fQ0KIA0KIENvbnRhY3RBY2NvdW50TGlzdCAqQ29udGFjdDo6Z2V0QWNjb3Vu dHMoKSBjb25zdA0KQEAgLTIwNSwxNyArMjEzLDE3IEBADQogDQogdm9pZCBD b250YWN0OjpzZXROYW1lKGNoYXIgKm5hbWUpDQogew0KLSAgdGhpcy0+bmFt ZSA9IHN0cmR1cChuYW1lKTsNCisgIGlmICh0aGlzLT5uYW1lKQ0KKwlmcmVl KHRoaXMtPm5hbWUpOw0KKyAgdGhpcy0+bmFtZSA9IG5hbWUgPyBzdHJkdXAo bmFtZSkgOiBOVUxMOw0KIH0NCiANCiB2b2lkIENvbnRhY3Q6OmxvZ2luKCkN CiB7DQotICBsb2dnZWQrKzsNCiB9DQogDQogdm9pZCBDb250YWN0Ojpsb2dv dXQoKQ0KIHsNCi0gIGxvZ2dlZC0tOw0KIH0NCiANCiB2b2lkIENvbnRhY3Q6 OmFkZEFjY291bnQoQ29udGFjdEFjY291bnQgKmNhKQ0KQEAgLTIyOSw2ICsy MzcsNjYgQEANCiAgIGdyb3VwID0gZzsNCiB9DQogDQorY2hhciAqQ29udGFj dDo6Z2V0U3RhdHVzU3RyaW5nKCkgY29uc3QNCit7DQorICByZXR1cm4gc3Rh dHVzU3RyaW5nOw0KK30NCisNCitpbnQgQ29udGFjdDo6Z2V0U3RhdHVzKCkg Y29uc3QNCit7DQorICByZXR1cm4gc3RhdHVzOw0KK30NCisNCit2b2lkIENv bnRhY3Q6OnVwZGF0ZVN0YXR1cyhpbnQgc3RhdHVzLCBjaGFyICpzdGF0dXNT dHJpbmcpDQorew0KKyAgLy8gQ2hlY2sgYWxsIHRoZSBjb250YWN0IGFjY291 bnRzIHRvIGZpbmQgdGhlIG1vc3QgbG9nZ2VkLWluIHN0YXR1cw0KKyAgaW50 IGN1cnJlbnRTdGF0dXMgPSAwOw0KKyAgQ29udGFjdEFjY291bnRMaXN0ICph Y2NvdW50TGlzdCA9IGNvbnRhY3RBY2NvdW50czsNCisNCisgIHdoaWxlIChh Y2NvdW50TGlzdCAmJiBhY2NvdW50TGlzdC0+Z2V0Rmlyc3QoKSkNCisgIHsN CisgICAgc3dpdGNoIChjdXJyZW50U3RhdHVzKQ0KKyAgICB7DQorICAgIGNh c2UgMDogLy8gb2ZmbGluZSwgYW55IHN0YXR1cyBpcyBoaWdoZXIgdGhhbiB0 aGlzDQorICAgICAgY3VycmVudFN0YXR1cyA9IGFjY291bnRMaXN0LT5nZXRG aXJzdCgpLT5nZXRTdGF0dXMoKTsNCisgICAgICBicmVhazsNCisgICAgY2Fz ZSAxOiAvLyBvbmxpbmUsIG5vIHN0YXR1cyBpcyBoaWdoZXIgdGhhbiB0aGlz DQorICAgICAgYnJlYWs7DQorICAgIGNhc2UgMjogLy8gYXdheSwgb25seSBv bmxpbmUgaXMgaGlnaGVyIHRoYW4gdGhpcw0KKyAgICAgIGlmIChhY2NvdW50 TGlzdC0+Z2V0Rmlyc3QoKS0+Z2V0U3RhdHVzKCkgPT0gMSkNCisgICAgICAg IGN1cnJlbnRTdGF0dXMgPSBhY2NvdW50TGlzdC0+Z2V0Rmlyc3QoKS0+Z2V0 U3RhdHVzKCk7DQorICAgICAgYnJlYWs7DQorICAgIH0NCisNCisgICAgYWNj b3VudExpc3QgPSBhY2NvdW50TGlzdC0+Z2V0TmV4dCgpOw0KKyAgfQ0KKw0K KyAgLy8gQ2hlY2sgaWYgdGhlIG5ldyBzdGF0dXMgaXMgbW9yZSBvbmxpbmUg b3IgYXQgbGVhc3QgdGhlIHNhbWUgb25saW5lbmVzcw0KKyAgaW50IHVwZGF0 ZSA9IDA7DQorICBzd2l0Y2ggKGN1cnJlbnRTdGF0dXMpDQorICB7DQorICBj YXNlIDA6IC8vIG9mZmxpbmUsIGFueSBzdGF0dXMgaXMgaGlnaGVyIHRoYW4g dGhpcw0KKyAgICB1cGRhdGUgPSAxOw0KKyAgICBicmVhazsNCisgIGNhc2Ug MTogLy8gb25saW5lLCBvbmx5IG1hdGNoZWQgYnkgb25saW5lDQorICAgIGlm IChzdGF0dXMgPT0gMSkNCisgICAgICB1cGRhdGUgPSAxOw0KKyAgICBicmVh azsNCisgIGNhc2UgMjogLy8gYXdheSwgbWF0Y2hlZCBieSBhbnkgbm9uLW9m ZmxpbmUNCisgICAgaWYgKHN0YXR1cyAhPSAwKQ0KKyAgICAgIHVwZGF0ZSA9 IDE7DQorICAgIGJyZWFrOw0KKyAgfQ0KKw0KKyAgaWYgKHVwZGF0ZSkNCisg IHsNCisgICAgdGhpcy0+c3RhdHVzID0gc3RhdHVzOw0KKyAgICBpZiAodGhp cy0+c3RhdHVzU3RyaW5nKQ0KKyAgICAgIGZyZWUodGhpcy0+c3RhdHVzU3Ry aW5nKTsNCisgICAgdGhpcy0+c3RhdHVzU3RyaW5nID0gc3RhdHVzU3RyaW5n ID8gc3RyZHVwKHN0YXR1c1N0cmluZyk6IE5VTEw7DQorICB9DQorfQ0KKw0K IC8qKiogQ29udGFjdExpc3QgKioqLw0KIA0KIENvbnRhY3RMaXN0OjpDb250 YWN0TGlzdCgpDQpAQCAtMzAwLDcgKzM2OCw3IEBADQogDQogR3JvdXA6Okdy b3VwKGNoYXIgKm5hbWUpDQogew0KLSAgdGhpcy0+bmFtZSA9IHN0cmR1cChu YW1lKTsNCisgIHRoaXMtPm5hbWUgPSBuYW1lID8gc3RyZHVwKG5hbWUpIDog TlVMTDsNCiAgIGNvbnRhY3RzID0gbmV3IENvbnRhY3RMaXN0KCk7DQogfQ0K IA0K ---1463811291-1988820259-1084480937=:21935 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Everybuddy-Dev mailing list [email protected] http://lists.spine.cx/listinfo/everybuddy-dev ---1463811291-1988820259-1084480937=:21935--