From kousik.nandy@gmail.com Mon Nov 6 06:27:45 2006 From: kousik.nandy@gmail.com (Kousik Nandy) Date: Mon, 6 Nov 2006 11:57:45 +0530 Subject: [OTR-dev] gaim 2 beta 4, patch to compile Message-ID: <257738bd0611052227i5a07fccfkbecb7746d620bc28@mail.gmail.com> ------=_Part_66198_16802233.1162794465490 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, When compiling gaim-otr for beta 4, I got the following error: gtk-dialog.c:33:22: gtkstock.h: No such file or directory gtk-dialog.c: In function `create_dialog': gtk-dialog.c:651: error: `GAIM_STOCK_DIALOG_ERROR' undeclared (first use in this function) gtk-dialog.c:651: error: (Each undeclared identifier is reported only once I digged around to see in beta 4, gtkstock.h has been renamed to gaimstock.h Attached is the full patch for beta 4, maybe we can publish a unified patch which checks the minor version, and include either gtkstock.h or gaimstock.h as per it is beta 2/3 or 4. regards Kousik. -- Kousik Nandy | kousiknandy@gmail.com | Network & Security | Cryptography | Photography | Free Software, Linux Hacking | Nature, Wildlife, Birdwatching | http://kousik.blogspot.com ------=_Part_66198_16802233.1162794465490 Content-Type: text/x-patch; name=beta4.diff; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: base64 X-Attachment-Id: f_eu6ho56a Content-Disposition: attachment; filename="beta4.diff" KioqIC90bXAvZ2FpbS1vdHItMy4wLjAvb3RyLXBsdWdpbi5jCTIwMDUtMTAtMjcgMjE6MzE6NTku MDAwMDAwMDAwICswNTMwCi0tLSAvdG1wL2dhaW0tb3RyLTMuMC4wLWJldGE0L290ci1wbHVnaW4u YwkyMDA2LTExLTA2IDExOjMxOjI0LjAwMDAwMDAwMCArMDUzMAoqKioqKioqKioqKioqKioKKioq IDMyLDQyICoqKioKICAKICAvKiBnYWltIGhlYWRlcnMgKi8KICAjaW5jbHVkZSAiZ2FpbS5oIgot ICNpbmNsdWRlICJjb3JlLmgiCiAgI2luY2x1ZGUgIm5vdGlmeS5oIgogICNpbmNsdWRlICJ2ZXJz aW9uLmgiCiAgI2luY2x1ZGUgInV0aWwuaCIKICAjaW5jbHVkZSAiZGVidWcuaCIKICAKICAjaWZk ZWYgVVNJTkdfR1RLCiAgLyogZ2FpbSBHVEsgaGVhZGVycyAqLwotLS0gMzIsNDIgLS0tLQogIAog IC8qIGdhaW0gaGVhZGVycyAqLwogICNpbmNsdWRlICJnYWltLmgiCiAgI2luY2x1ZGUgIm5vdGlm eS5oIgogICNpbmNsdWRlICJ2ZXJzaW9uLmgiCiAgI2luY2x1ZGUgInV0aWwuaCIKICAjaW5jbHVk ZSAiZGVidWcuaCIKKyAjaW5jbHVkZSAiY29yZS5oIgogIAogICNpZmRlZiBVU0lOR19HVEsKICAv KiBnYWltIEdUSyBoZWFkZXJzICovCioqKioqKioqKioqKioqKgoqKiogMTU2LDE2MiAqKioqCi0t LSAxNTYsMTY2IC0tLS0KICAgICAgYnVkZHkgPSBnYWltX2ZpbmRfYnVkZHkoYWNjb3VudCwgcmVj aXBpZW50KTsKICAgICAgaWYgKCFidWRkeSkgcmV0dXJuIC0xOwogIAorICNpZiBHQUlNX01BSk9S X1ZFUlNJT04gPCAyCiAgICAgIHJldHVybiAoYnVkZHktPnByZXNlbnQgPT0gR0FJTV9CVUREWV9P TkxJTkUpOworICNlbHNlCisgICAgIHJldHVybiAoR0FJTV9CVUREWV9JU19PTkxJTkUoYnVkZHkp KTsKKyAjZW5kaWYKICB9CiAgCiAgc3RhdGljIHZvaWQgaW5qZWN0X21lc3NhZ2VfY2Iodm9pZCAq b3BkYXRhLCBjb25zdCBjaGFyICphY2NvdW50bmFtZSwKKioqKioqKioqKioqKioqCioqKiAzOTUs NDAwICoqKioKLS0tIDM5OSw0MDYgLS0tLQogICAgICBvdHJnX2RpYWxvZ19yZXNlbnNpdGl6ZV9h bGwoKTsKICB9CiAgCisgI2lmIEdBSU1fTUFKT1JfVkVSU0lPTiA8IDIKKyAvKiBnYWltLTIuMC4w IG5vIGxvbmdlciBoYXMgdGhlIHJvdyBvZiBidXR0b25zIGluIHF1ZXN0aW9uICovCiAgc3RhdGlj IHZvaWQgcHJvY2Vzc19idXR0b25fdHlwZV9jaGFuZ2UoY29uc3QgY2hhciAqbmFtZSwgR2FpbVBy ZWZUeXBlIHR5cGUsCiAgCWdwb2ludGVyIHZhbHVlLCBncG9pbnRlciBkYXRhKQogIHsKKioqKioq KioqKioqKioqCioqKiA0MDQsNDA5ICoqKioKLS0tIDQxMCw0MTYgLS0tLQogICAgICAgKiBidXR0 b25zIGFzIHdlbGwuICovCiAgICAgIG90cmdfZGlhbG9nX3Jlc2Vuc2l0aXplX2FsbCgpOwogIH0K KyAjZW5kaWYKICAKICBzdGF0aWMgdm9pZCBvdHJfb3B0aW9uc19jYihHYWltQmxpc3ROb2RlICpu b2RlLCBncG9pbnRlciB1c2VyX2RhdGEpCiAgewoqKioqKioqKioqKioqKioKKioqIDQxNiw0MjIg KioqKgotLS0gNDIzLDQzMyAtLS0tCiAgCiAgc3RhdGljIHZvaWQgc3VwcGx5X2V4dGVuZGVkX21l bnUoR2FpbUJsaXN0Tm9kZSAqbm9kZSwgR0xpc3QgKiptZW51KQogIHsKKyAjaWYgR0FJTV9NQUpP Ul9WRVJTSU9OIDwgMgogICAgICBHYWltQmxpc3ROb2RlQWN0aW9uICphY3Q7CisgI2Vsc2UKKyAg ICAgR2FpbU1lbnVBY3Rpb24gKmFjdDsKKyAjZW5kaWYKICAgICAgR2FpbUJ1ZGR5ICpidWRkeTsK ICAgICAgR2FpbUFjY291bnQgKmFjY3Q7CiAgICAgIGNvbnN0IGNoYXIgKnByb3RvOwoqKioqKioq KioqKioqKioKKioqIDQzMCw0MzYgKioqKgotLS0gNDQxLDQ1MiAtLS0tCiAgICAgIHByb3RvID0g Z2FpbV9hY2NvdW50X2dldF9wcm90b2NvbF9pZChhY2N0KTsKICAgICAgaWYgKCFvdHJnX3BsdWdp bl9wcm90b19zdXBwb3J0c19vdHIocHJvdG8pKSByZXR1cm47CiAgCisgI2lmIEdBSU1fTUFKT1Jf VkVSU0lPTiA8IDIKICAgICAgYWN0ID0gZ2FpbV9ibGlzdF9ub2RlX2FjdGlvbl9uZXcoIk9UUiBT ZXR0aW5ncyIsIG90cl9vcHRpb25zX2NiLCBOVUxMKTsKKyAjZWxzZQorICAgICBhY3QgPSBnYWlt X21lbnVfYWN0aW9uX25ldygiT1RSIFNldHRpbmdzIiwgKEdhaW1DYWxsYmFjaylvdHJfb3B0aW9u c19jYiwKKyAJICAgIE5VTEwsIE5VTEwpOworICNlbmRpZgogICAgICAqbWVudSA9IGdfbGlzdF9h cHBlbmQoKm1lbnUsIGFjdCk7CiAgfQogIAoqKioqKioqKioqKioqKioKKioqIDQ4Miw0OTAgKioq KgotLS0gNDk4LDUxNCAtLS0tCiAgICAgIGFjY291bnQgPSBnYWltX2FjY291bnRzX2ZpbmQoY29u dGV4dC0+YWNjb3VudG5hbWUsIGNvbnRleHQtPnByb3RvY29sKTsKICAgICAgaWYgKGFjY291bnQg PT0gTlVMTCkgcmV0dXJuIE5VTEw7CiAgCisgI2lmIEdBSU1fTUFKT1JfVkVSU0lPTiA8IDIKICAg ICAgY29udiA9IGdhaW1fZmluZF9jb252ZXJzYXRpb25fd2l0aF9hY2NvdW50KGNvbnRleHQtPnVz ZXJuYW1lLCBhY2NvdW50KTsKKyAjZWxzZQorICAgICBjb252ID0gZ2FpbV9maW5kX2NvbnZlcnNh dGlvbl93aXRoX2FjY291bnQoR0FJTV9DT05WX1RZUEVfSU0sIGNvbnRleHQtPnVzZXJuYW1lLCBh Y2NvdW50KTsKKyAjZW5kaWYKICAgICAgaWYgKGNvbnYgPT0gTlVMTCAmJiBmb3JjZV9jcmVhdGUp IHsKKyAjaWYgR0FJTV9NQUpPUl9WRVJTSU9OIDwgMgogIAljb252ID0gZ2FpbV9jb252ZXJzYXRp b25fbmV3KEdBSU1fQ09OVl9JTSwgYWNjb3VudCwgY29udGV4dC0+dXNlcm5hbWUpOworICNlbHNl CisgCWNvbnYgPSBnYWltX2NvbnZlcnNhdGlvbl9uZXcoR0FJTV9DT05WX1RZUEVfSU0sIGFjY291 bnQsIGNvbnRleHQtPnVzZXJuYW1lKTsKKyAjZW5kaWYKICAgICAgfQogIAogICAgICByZXR1cm4g Y29udjsKKioqKioqKioqKioqKioqCioqKiA1MjMsNTI5ICoqKioKLS0tIDU0Nyw1NTYgLS0tLQog ICAgICB9CiAgfQogIAorICNpZiBHQUlNX01BSk9SX1ZFUlNJT04gPCAyCisgLyogZ2FpbS0yLjAu MCBubyBsb25nZXIgaGFzIHRoZSByb3cgb2YgYnV0dG9ucyBpbiBxdWVzdGlvbiAqLwogIHN0YXRp YyBndWludCBidXR0b25fdHlwZV9jYmlkOworICNlbmRpZgogIAogIHN0YXRpYyBnYm9vbGVhbiBv dHJfcGx1Z2luX2xvYWQoR2FpbVBsdWdpbiAqaGFuZGxlKQogIHsKKioqKioqKioqKioqKioqCioq KiA1NjcsNTc1ICoqKioKLS0tIDU5NCw2MDQgLS0tLQogIAkgICAgR0FJTV9DQUxMQkFDSyhwcm9j ZXNzX2Nvbm5lY3Rpb25fY2hhbmdlKSwgTlVMTCk7CiAgICAgIGdhaW1fc2lnbmFsX2Nvbm5lY3Qo Ymxpc3RfaGFuZGxlLCAiYmxpc3Qtbm9kZS1leHRlbmRlZC1tZW51IiwKICAJICAgIG90cmdfcGx1 Z2luX2hhbmRsZSwgR0FJTV9DQUxMQkFDSyhzdXBwbHlfZXh0ZW5kZWRfbWVudSksIE5VTEwpOwor ICNpZiBHQUlNX01BSk9SX1ZFUlNJT04gPCAyCiAgICAgIGJ1dHRvbl90eXBlX2NiaWQgPSBnYWlt X3ByZWZzX2Nvbm5lY3RfY2FsbGJhY2soCiAgCSAgICAiL2dhaW0vZ3RrL2NvbnZlcnNhdGlvbnMv YnV0dG9uX3R5cGUiLAogIAkgICAgcHJvY2Vzc19idXR0b25fdHlwZV9jaGFuZ2UsIE5VTEwpOwor ICNlbmRpZgogIAogICAgICBnYWltX2NvbnZlcnNhdGlvbl9mb3JlYWNoKG90cmdfZGlhbG9nX25l d19jb252KTsKICAKKioqKioqKioqKioqKioqCioqKiA2MDEsNjA3ICoqKioKLS0tIDYzMCw2Mzgg LS0tLQogIAkgICAgR0FJTV9DQUxMQkFDSyhwcm9jZXNzX2Nvbm5lY3Rpb25fY2hhbmdlKSk7CiAg ICAgIGdhaW1fc2lnbmFsX2Rpc2Nvbm5lY3QoYmxpc3RfaGFuZGxlLCAiYmxpc3Qtbm9kZS1leHRl bmRlZC1tZW51IiwKICAJICAgIG90cmdfcGx1Z2luX2hhbmRsZSwgR0FJTV9DQUxMQkFDSyhzdXBw bHlfZXh0ZW5kZWRfbWVudSkpOworICNpZiBHQUlNX01BSk9SX1ZFUlNJT04gPCAyCiAgICAgIGdh aW1fcHJlZnNfZGlzY29ubmVjdF9jYWxsYmFjayhidXR0b25fdHlwZV9jYmlkKTsKKyAjZW5kaWYK ICAKICAgICAgZ2FpbV9jb252ZXJzYXRpb25fZm9yZWFjaChvdHJnX2RpYWxvZ19yZW1vdmVfY29u dik7CiAgCioqKioqKioqKioqKioqKgoqKiogNjQwLDY0OSAqKioqCiAgewogIAlHQUlNX1BMVUdJ Tl9NQUdJQywKICAKICAJLyogV2Ugc3RpY2sgd2l0aCB0aGUgZnVuY3Rpb25zIGluIHRoZSBnYWlt IDEuMC54IEFQSSBmb3IKICAJICogY29tcGF0aWJpbGl0eS4gKi8KISAJMSwgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBtYWpvciB2ZXJzaW9uICAqLwog IAkwLCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIG1p bm9yIHZlcnNpb24gICovCiAgCiAgCUdBSU1fUExVR0lOX1NUQU5EQVJELCAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLyogdHlwZSAgICAgICAgICAgKi8KICAJUExVR0lOX1RZUEUsICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiB1aV9yZXF1aXJlbWVudCAqLwotLS0g NjcxLDY4NiAtLS0tCiAgewogIAlHQUlNX1BMVUdJTl9NQUdJQywKICAKKyAjaWYgR0FJTV9NQUpP Ul9WRVJTSU9OIDwgMgogIAkvKiBXZSBzdGljayB3aXRoIHRoZSBmdW5jdGlvbnMgaW4gdGhlIGdh aW0gMS4wLnggQVBJIGZvcgogIAkgKiBjb21wYXRpYmlsaXR5LiAqLwohICAgICAgICAgMSwgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBtYWpvciB2ZXJz aW9uICAqLwogIAkwLCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8qIG1pbm9yIHZlcnNpb24gICovCisgI2Vsc2UKKyAgICAgICAgIC8qIFVzZSB0aGUgMi4w LnggQVBJICovCisgICAgICAgICAyLCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIC8qIG1ham9yIHZlcnNpb24gICovCisgCTAsICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogbWlub3IgdmVyc2lvbiAgKi8KKyAjZW5k aWYKICAKICAJR0FJTV9QTFVHSU5fU1RBTkRBUkQsICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAvKiB0eXBlICAgICAgICAgICAqLwogIAlQTFVHSU5fVFlQRSwgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIC8qIHVpX3JlcXVpcmVtZW50ICovCioqKiAvdG1wL2dhaW0tb3Ry LTMuMC4wL2d0ay1kaWFsb2cuYwkyMDA1LTEwLTI4IDA5OjA4OjIxLjAwMDAwMDAwMCArMDUzMAot LS0gL3RtcC9nYWltLW90ci0zLjAuMC1iZXRhNC9ndGstZGlhbG9nLmMJMjAwNi0xMS0wNiAxMToz NDo1Mi4wMDAwMDAwMDAgKzA1MzAKKioqKioqKioqKioqKioqCioqKiAyNiwzMiAqKioqCi0tLSAy NiwzNyAtLS0tCiAgI2luY2x1ZGUgPGdjcnlwdC5oPgogIAogIC8qIGdhaW0gaGVhZGVycyAqLwor ICNpbmNsdWRlICJ2ZXJzaW9uLmgiCisgI2lmIEdBSU1fTUFKT1JfVkVSU0lPTiA8IDIKICAjaW5j bHVkZSAic3RvY2suaCIKKyAjZWxzZQorICNpbmNsdWRlICJnYWltc3RvY2suaCIKKyAjZW5kaWYK ICAjaW5jbHVkZSAicGx1Z2luLmgiCiAgI2luY2x1ZGUgIm5vdGlmeS5oIgogICNpbmNsdWRlICJn dGtjb252LmgiCioqKioqKioqKioqKioqKgoqKiogNzc5LDc4NSAqKioqCi0tLSA3ODQsNzk0IC0t LS0KICAgICAgYWNjb3VudCA9IGdhaW1fYWNjb3VudHNfZmluZChhY2NvdW50bmFtZSwgcHJvdG9j b2wpOwogICAgICBpZiAoIWFjY291bnQpIHJldHVybiAtMTsKICAKKyAjaWYgR0FJTV9NQUpPUl9W RVJTSU9OIDwgMgogICAgICBjb252ID0gZ2FpbV9maW5kX2NvbnZlcnNhdGlvbl93aXRoX2FjY291 bnQodXNlcm5hbWUsIGFjY291bnQpOworICNlbHNlCisgICAgIGNvbnYgPSBnYWltX2ZpbmRfY29u dmVyc2F0aW9uX3dpdGhfYWNjb3VudChHQUlNX0NPTlZfVFlQRV9JTSwgdXNlcm5hbWUsIGFjY291 bnQpOworICNlbmRpZgogICAgICBpZiAoIWNvbnYpIHJldHVybiAtMTsKICAKICAgICAgZ2FpbV9j b252ZXJzYXRpb25fd3JpdGUoY29udiwgTlVMTCwgbXNnLCBHQUlNX01FU1NBR0VfU1lTVEVNLCB0 aW1lKE5VTEwpKTsKKioqKioqKioqKioqKioqCioqKiA5MDgsOTE0ICoqKioKLS0tIDkxNyw5Mjcg LS0tLQogICAgICBHdGtXaWRnZXQgKm1lbnVxdWVyeWxhYmVsOwogICAgICBHdGtXaWRnZXQgKm1l bnV2aWV3OwogICAgICBHdGtXaWRnZXQgKm1lbnV2ZXJmOworICNpZiBHQUlNX01BSk9SX1ZFUlNJ T04gPCAyCisgICAgIC8qIGdhaW0tMi4wLjAgbm8gbG9uZ2VyIGhhcyB0aGUgcm93IG9mIGJ1dHRv bnMsIHNvIGl0IGRvZXNuJ3QgaGF2ZQorICAgICAgKiB0aGUgYnV0dG9uX3R5cGUgcHJlZiAqLwog ICAgICBHYWltQnV0dG9uU3R5bGUgYnV0dG9uc3R5bGU7CisgI2VuZGlmCiAgICAgIEdhaW1HdGtD b252ZXJzYXRpb24gKmd0a2NvbnYgPSBHQUlNX0dUS19DT05WRVJTQVRJT04oY29udik7CiAgICAg IGxhYmVsID0gZ2FpbV9jb252ZXJzYXRpb25fZ2V0X2RhdGEoY29udiwgIm90ci1sYWJlbCIpOwog ICAgICBpY29uID0gZ2FpbV9jb252ZXJzYXRpb25fZ2V0X2RhdGEoY29udiwgIm90ci1pY29uIik7 CioqKioqKioqKioqKioqKgoqKiogOTE5LDkyNSAqKioqCi0tLSA5MzIsOTQwIC0tLS0KICAgICAg bWVudWVuZCA9IGdhaW1fY29udmVyc2F0aW9uX2dldF9kYXRhKGNvbnYsICJvdHItbWVudWVuZCIp OwogICAgICBtZW51dmlldyA9IGdhaW1fY29udmVyc2F0aW9uX2dldF9kYXRhKGNvbnYsICJvdHIt bWVudXZpZXciKTsKICAgICAgbWVudXZlcmYgPSBnYWltX2NvbnZlcnNhdGlvbl9nZXRfZGF0YShj b252LCAib3RyLW1lbnV2ZXJmIik7CisgI2lmIEdBSU1fTUFKT1JfVkVSU0lPTiA8IDIKICAgICAg YnV0dG9uc3R5bGUgPSBnYWltX3ByZWZzX2dldF9pbnQoIi9nYWltL2d0ay9jb252ZXJzYXRpb25z L2J1dHRvbl90eXBlIik7CisgI2VuZGlmCiAgCiAgICAgIC8qIFNldCB0aGUgYnV0dG9uJ3MgaWNv biwgbGFiZWwgYW5kIHRvb2x0aXAuICovCiAgICAgIG90cl9pY29uKGljb24sIGxldmVsKTsKKioq KioqKioqKioqKioqCioqKiA5NDgsOTUzICoqKioKLS0tIDk2Myw5NjkgLS0tLQogIAogICAgICAv KiBTZXQgdGhlIGFwcHJvcHJpYXRlIHZpc2liaWxpdHkgKi8KICAgICAgZ3RrX3dpZGdldF9zaG93 X2FsbChidXR0b24pOworICNpZiBHQUlNX01BSk9SX1ZFUlNJT04gPCAyCiAgICAgIGlmIChidXR0 b25zdHlsZSA9PSBHQUlNX0JVVFRPTl9JTUFHRSkgewogIAkvKiBIaWRlIHRoZSB0ZXh0ICovCiAg CWd0a193aWRnZXRfaGlkZShpY29udGV4dCk7CioqKioqKioqKioqKioqKgoqKiogOTU4LDk2MyAq KioqCi0tLSA5NzQsOTgwIC0tLS0KICAJZ3RrX3dpZGdldF9oaWRlKGljb250ZXh0KTsKICAJZ3Rr X3dpZGdldF9oaWRlKGljb24pOwogICAgICB9CisgI2VuZGlmCiAgfQogIAogIHN0YXRpYyB2b2lk IGRpYWxvZ191cGRhdGVfbGFiZWwoQ29ubkNvbnRleHQgKmNvbnRleHQpCioqKioqKioqKioqKioq KgoqKiogOTY4LDk3NCAqKioqCi0tLSA5ODUsOTk1IC0tLS0KICAKICAgICAgYWNjb3VudCA9IGdh aW1fYWNjb3VudHNfZmluZChjb250ZXh0LT5hY2NvdW50bmFtZSwgY29udGV4dC0+cHJvdG9jb2wp OwogICAgICBpZiAoIWFjY291bnQpIHJldHVybjsKKyAjaWYgR0FJTV9NQUpPUl9WRVJTSU9OIDwg MgogICAgICBjb252ID0gZ2FpbV9maW5kX2NvbnZlcnNhdGlvbl93aXRoX2FjY291bnQoY29udGV4 dC0+dXNlcm5hbWUsIGFjY291bnQpOworICNlbHNlCisgICAgIGNvbnYgPSBnYWltX2ZpbmRfY29u dmVyc2F0aW9uX3dpdGhfYWNjb3VudChHQUlNX0NPTlZfVFlQRV9JTSwgY29udGV4dC0+dXNlcm5h bWUsIGFjY291bnQpOworICNlbmRpZgogICAgICBpZiAoIWNvbnYpIHJldHVybjsKICAgICAgZGlh bG9nX3VwZGF0ZV9sYWJlbF9jb252KGNvbnYsIGxldmVsKTsKICB9CioqKioqKioqKioqKioqKgoq KiogMTI1MiwxMjU4ICoqKioKLS0tIDEyNzMsMTI4MyAtLS0tCiAgICAgIGFjY291bnQgPSBnYWlt X2FjY291bnRzX2ZpbmQoYWNjb3VudG5hbWUsIHByb3RvY29sKTsKICAgICAgaWYgKCFhY2NvdW50 KSByZXR1cm47CiAgCisgI2lmIEdBSU1fTUFKT1JfVkVSU0lPTiA8IDIKICAgICAgY29udiA9IGdh aW1fZmluZF9jb252ZXJzYXRpb25fd2l0aF9hY2NvdW50KHVzZXJuYW1lLCBhY2NvdW50KTsKKyAj ZWxzZQorICAgICBjb252ID0gZ2FpbV9maW5kX2NvbnZlcnNhdGlvbl93aXRoX2FjY291bnQoR0FJ TV9DT05WX1RZUEVfSU0sIHVzZXJuYW1lLCBhY2NvdW50KTsKKyAjZW5kaWYKICAgICAgaWYgKCFj b252KSByZXR1cm47CiAgCiAgICAgIGJ1ZiA9IGdfc3RyZHVwX3ByaW50ZigiJXMgaGFzIGVuZGVk IGhpcyBwcml2YXRlIGNvbnZlcnNhdGlvbiB3aXRoIHlvdTsgIgoqKioqKioqKioqKioqKioKKioq IDE0MDYsMTQxNCAqKioqCiAgICAgIEd0a1dpZGdldCAqd2hhdHN0aGlzOwogIAogICAgICAvKiBE byBub3RoaW5nIGlmIHRoaXMgaXNuJ3QgYW4gSU0gY29udmVyc2F0aW9uICovCiAgICAgIGlmIChn YWltX2NvbnZlcnNhdGlvbl9nZXRfdHlwZShjb252KSAhPSBHQUlNX0NPTlZfSU0pIHJldHVybjsK LSAKICAgICAgYmJveCA9IGd0a2NvbnYtPmJib3g7CiAgCiAgICAgIGNvbnRleHQgPSBvdHJnX3Bs dWdpbl9jb252X3RvX2NvbnRleHQoY29udik7CiAgCi0tLSAxNDMxLDE0NDMgLS0tLQogICAgICBH dGtXaWRnZXQgKndoYXRzdGhpczsKICAKICAgICAgLyogRG8gbm90aGluZyBpZiB0aGlzIGlzbid0 IGFuIElNIGNvbnZlcnNhdGlvbiAqLworICNpZiBHQUlNX01BSk9SX1ZFUlNJT04gPCAyCiAgICAg IGlmIChnYWltX2NvbnZlcnNhdGlvbl9nZXRfdHlwZShjb252KSAhPSBHQUlNX0NPTlZfSU0pIHJl dHVybjsKICAgICAgYmJveCA9IGd0a2NvbnYtPmJib3g7CisgI2Vsc2UKKyAgICAgaWYgKGdhaW1f Y29udmVyc2F0aW9uX2dldF90eXBlKGNvbnYpICE9IEdBSU1fQ09OVl9UWVBFX0lNKSByZXR1cm47 CisgICAgIGJib3ggPSBndGtjb252LT5sb3dlcl9oYm94OworICNlbmRpZgogIAogICAgICBjb250 ZXh0ID0gb3RyZ19wbHVnaW5fY29udl90b19jb250ZXh0KGNvbnYpOwogIAoqKioqKioqKioqKioq KioKKioqIDE1MTUsMTUyMSAqKioqCi0tLSAxNTQ0LDE1NTQgLS0tLQogICAgICBHdGtXaWRnZXQg KmJ1dHRvbjsKICAKICAgICAgLyogRG8gbm90aGluZyBpZiB0aGlzIGlzbid0IGFuIElNIGNvbnZl cnNhdGlvbiAqLworICNpZiBHQUlNX01BSk9SX1ZFUlNJT04gPCAyCiAgICAgIGlmIChnYWltX2Nv bnZlcnNhdGlvbl9nZXRfdHlwZShjb252KSAhPSBHQUlNX0NPTlZfSU0pIHJldHVybjsKKyAjZWxz ZQorICAgICBpZiAoZ2FpbV9jb252ZXJzYXRpb25fZ2V0X3R5cGUoY29udikgIT0gR0FJTV9DT05W X1RZUEVfSU0pIHJldHVybjsKKyAjZW5kaWYKICAKICAgICAgYnV0dG9uID0gZ2FpbV9jb252ZXJz YXRpb25fZ2V0X2RhdGEoY29udiwgIm90ci1idXR0b24iKTsKICAgICAgaWYgKGJ1dHRvbikgZ3Rr X29iamVjdF9kZXN0cm95KEdUS19PQkpFQ1QoYnV0dG9uKSk7CioqKioqKioqKioqKioqKgoqKiog MTUzMSwxNTM3ICoqKioKLS0tIDE1NjQsMTU3NCAtLS0tCiAgICAgIE90cmxQb2xpY3kgcG9saWN5 OwogIAogICAgICAvKiBEbyBub3RoaW5nIGlmIHRoaXMgaXNuJ3QgYW4gSU0gY29udmVyc2F0aW9u ICovCisgI2lmIEdBSU1fTUFKT1JfVkVSU0lPTiA8IDIKICAgICAgaWYgKGdhaW1fY29udmVyc2F0 aW9uX2dldF90eXBlKGNvbnYpICE9IEdBSU1fQ09OVl9JTSkgcmV0dXJuOworICNlbHNlCisgICAg IGlmIChnYWltX2NvbnZlcnNhdGlvbl9nZXRfdHlwZShjb252KSAhPSBHQUlNX0NPTlZfVFlQRV9J TSkgcmV0dXJuOworICNlbmRpZgogIAogICAgICBhY2NvdW50ID0gZ2FpbV9jb252ZXJzYXRpb25f Z2V0X2FjY291bnQoY29udik7CiAgICAgIG5hbWUgPSBnYWltX2NvbnZlcnNhdGlvbl9nZXRfbmFt ZShjb252KTsK ------=_Part_66198_16802233.1162794465490-- From paul@cypherpunks.ca Tue Nov 7 15:53:47 2006 From: paul@cypherpunks.ca (Paul Wouters) Date: Tue, 7 Nov 2006 16:53:47 +0100 (CET) Subject: [OTR-dev] gaim 2 beta 4, patch to compile In-Reply-To: <257738bd0611052227i5a07fccfkbecb7746d620bc28@mail.gmail.com> References: <257738bd0611052227i5a07fccfkbecb7746d620bc28@mail.gmail.com> Message-ID: On Mon, 6 Nov 2006, Kousik Nandy wrote: > > When compiling gaim-otr for beta 4, I got the following error: > > gtk-dialog.c:33:22: gtkstock.h: No such file or directory > gtk-dialog.c: In function `create_dialog': > gtk-dialog.c:651: error: `GAIM_STOCK_DIALOG_ERROR' undeclared (first > use in this function) > gtk-dialog.c:651: error: (Each undeclared identifier is reported only once > > I digged around to see in beta 4, gtkstock.h has been renamed to gaimstock.h > > Attached is the full patch for beta 4, I had a patch for the gtkstick.h and the GAIM_* define errors, but you have added moer defines. Why were those necessary, since the FC6-extras version seem to work fully without the additiona #ifdef's you added. > maybe we can publish a unified > patch which checks the minor version, and include either gtkstock.h or > gaimstock.h as per it is beta 2/3 or 4. I don't need we should do that for "betas". As soon as 2.0.0 final is released, we should only check for 1.5.x vs 2.0.x and forget about all the beta releases in the middle. Paul ps.I am still waiting for my build environment at home to come back up, so I can release a gaim.dll for beta4 for windows. But I am 6 hours away from home until saturday. From nikita@uiuc.edu Tue Nov 7 16:24:26 2006 From: nikita@uiuc.edu (Nikita Borisov) Date: Tue, 7 Nov 2006 10:24:26 -0600 Subject: [OTR-dev] gaim 2 beta 4, patch to compile In-Reply-To: References: <257738bd0611052227i5a07fccfkbecb7746d620bc28@mail.gmail.com> Message-ID: <16f0378d0611070824s4f841adbla6fcd2c7faad4d44@mail.gmail.com> On 11/7/06, Paul Wouters wrote: > > maybe we can publish a unified > > patch which checks the minor version, and include either gtkstock.h or > > gaimstock.h as per it is beta 2/3 or 4. > > I don't need we should do that for "betas". As soon as 2.0.0 final is > released, we should only check for 1.5.x vs 2.0.x and forget about > all the beta releases in the middle. In fact, last I checked, the minor version is 0 for all gaim2 betas, so we can't really use that as a solution. - Nikita From kousik.nandy@gmail.com Tue Nov 7 20:31:12 2006 From: kousik.nandy@gmail.com (Kousik Nandy) Date: Wed, 8 Nov 2006 02:01:12 +0530 Subject: [OTR-dev] gaim 2 beta 4, patch to compile In-Reply-To: References: <257738bd0611052227i5a07fccfkbecb7746d620bc28@mail.gmail.com> Message-ID: <257738bd0611071231p13a1c20cp6cb8a28c52168745@mail.gmail.com> On 11/7/06, Paul Wouters wrote: [...] > > > > I digged around to see in beta 4, gtkstock.h has been renamed to gaimstock.h > > I had a patch for the gtkstick.h and the GAIM_* define errors, but you have > added moer defines. Why were those necessary, Uh, my patch should be identical with the gaim2beta2 patch available in the OTR page except one single change: #include "gtkstock.h" is replaced by #include "gaimstock.h" Any additional change is extraneous and can be discarded (and I believe there aren't). > I don't need we should do that for "betas". As soon as 2.0.0 final is > released, we should only check for 1.5.x vs 2.0.x Fair enough. So as we publish a beta2 patch, we can publish a beta4 patch too, "on top of" the beta2 patch, as available in http://kousik.blogspot.com/2006/11/otr-plugin-on-gaim-2-beta-4.html regards Kousik From alex323@gmail.com Tue Nov 7 20:42:57 2006 From: alex323@gmail.com (Alex) Date: Tue, 7 Nov 2006 15:42:57 -0500 Subject: [OTR-dev] Code modifications concerning fragmentation Message-ID: <20061107154257.26cf8ef8@darwin> Has anyone been able to solve the problem of sending fragments? In order for fragmentation to work, a lot of code would need to be rewritten and changed. For example, a message pointer is currently used to return the secured message instead of inject_message, but it only allows for one message. inject_message is the easiest way of communicating the fragments to the host program, but then the gaim-otr plugin would need to be changed. Any ideas? -- Alex From paul@cypherpunks.ca Wed Nov 8 02:52:40 2006 From: paul@cypherpunks.ca (Paul Wouters) Date: Wed, 8 Nov 2006 03:52:40 +0100 (CET) Subject: [OTR-dev] gaim 2 beta 4, patch to compile In-Reply-To: <257738bd0611071231p13a1c20cp6cb8a28c52168745@mail.gmail.com> References: <257738bd0611052227i5a07fccfkbecb7746d620bc28@mail.gmail.com> <257738bd0611071231p13a1c20cp6cb8a28c52168745@mail.gmail.com> Message-ID: On Wed, 8 Nov 2006, Kousik Nandy wrote: > > Uh, my patch should be identical with the gaim2beta2 patch available > in the OTR page except one single change: #include "gtkstock.h" is > replaced by #include "gaimstock.h" Then I think you miss something? The patch against the latest CVS snapshot is: (not supporting gaim 1.5, Ian can add teh #idef's): http://chameleon.cypherpunks.ca/gaim-beta4.patch It includes a few changes of GAIM_STOCK_* into GTK_STOCK_* > Fair enough. So as we publish a beta2 patch, we can publish a beta4 > patch too What should really happen is a real release instead of this mucking in cvs versions. I hope Ian will do this as soon as we got a Windows DLL as well. (I'm still waiting for my link to come back up) Paul From kousik.nandy@gmail.com Wed Nov 8 05:30:33 2006 From: kousik.nandy@gmail.com (Kousik Nandy) Date: Wed, 8 Nov 2006 11:00:33 +0530 Subject: [OTR-dev] gaim 2 beta 4, patch to compile In-Reply-To: References: <257738bd0611052227i5a07fccfkbecb7746d620bc28@mail.gmail.com> <257738bd0611071231p13a1c20cp6cb8a28c52168745@mail.gmail.com> Message-ID: <257738bd0611072130k64a0ca66m42f8bc96d2819f48@mail.gmail.com> On 11/8/06, Paul Wouters wrote: > On Wed, 8 Nov 2006, Kousik Nandy wrote: [...] > The patch against the latest CVS snapshot is: > (not supporting gaim 1.5, Ian can add teh #idef's): > > http://chameleon.cypherpunks.ca/gaim-beta4.patch > > It includes a few changes of GAIM_STOCK_* into GTK_STOCK_* Those changes aren't necessary at all if we include "gaimstock.h" instead of "gtkstock.h" (beta4 onwards). Rest of beta 2 patch stays valid. Kousik From paul@cypherpunks.ca Mon Nov 20 04:12:02 2006 From: paul@cypherpunks.ca (Paul Wouters) Date: Mon, 20 Nov 2006 05:12:02 +0100 (CET) Subject: [OTR-dev] Two GUI issues Message-ID: While testing and running 2.0.0beta4 and gaim-otr we noticed two things. 1) The first OTR window to pop up "new fingerprint presented to you" is confusing (and useless). It shows the new fingerprint, but not the full identity of the user. It also does not show my own key. And it asks for "OK". This makes me think I need to "OK" the key, instead of "OK"ing the window. I suggest to just get rid of this window altogether and replace it with the "verify fingerprint" window, which really has everything we need, including a default of "I have not verified" for the OK button. 2) The verify fingerprint windows says "Fingerprint for you, myusername". This is confusing. Is it MY fingerprint or is it the other fingerprint that is "for me". Change "fingerprint for you" to "your fingerprint of" Paul From gdt@ir.bbn.com Tue Nov 21 11:11:58 2006 From: gdt@ir.bbn.com (Greg Troxel) Date: Tue, 21 Nov 2006 06:11:58 -0500 Subject: [OTR-dev] Gaim 2.0.0beta4 In-Reply-To: (Paul Wouters's message of "Sat\, 28 Oct 2006 08\:27\:35 +0200 \(CEST\)") References: <1161363301.15169.6.camel@midnight> <200610240814.24174.wezlo@comcast.net> Message-ID: --=-=-= Content-Transfer-Encoding: quoted-printable for fedora I had to change the path to the gtk include files manually. Ian: any change for a configure option for that the gtk2 includes? Fedora now puts it in /usr/include/gtk-2.0/gtk We should be using pkg-config to find include and link paths. NetBSD pkgsrc puts the includes in /usr/pkg/include/gtk-2.0, but pkg-config looks right. > pkg-config --cflags gtk+-2.0 =2DO2 -DXTHREADS -I/usr/pkg/include/gtk-2.0 -I/usr/pkg/lib/gtk-2.0/include = -I/usr/pkg/include/atk-1.0 -I/usr/pkg/include/cairo -I/usr/pkg/include/pang= o-1.0 -I/usr/pkg/include -I/usr/X11R6/include -I/usr/pkg/include/glib/glib-= 2.0 -I/usr/pkg/lib/glib-2.0/include -I/usr/pkg/include/freetype2 -I/usr/pkg= /include/libpng12 > pkg-config --libs gtk+-2.0 =2DWl,-R/usr/pkg/lib -Wl,--rpath -Wl,/usr/pkg/lib -Wl,-R/usr/X11R6/lib -L/u= sr/pkg/lib -L/usr/X11R6/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -lXi -latk-1.0 -lgd= k_pixbuf-2.0 -lpangocairo-1.0 -lXrandr -lXext -lXcursor -lXfixes -lcairo -l= pangoft2-1.0 -lfontconfig -lfreetype -lz -lpango-1.0 -lm -lXrender -lX11 -l= gobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl =2D-=20 Greg Troxel --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (NetBSD) iD8DBQFFYt8C+vesoDJhHiURAkQoAJ0Y0Aw2IjMJLYn8SYxQyLhALFWZ9wCgnxyf TdwaoiAvsbFtFQqRNr8+JDQ= =2vEx -----END PGP SIGNATURE----- --=-=-=-- From ian@cypherpunks.ca Tue Nov 28 23:40:28 2006 From: ian@cypherpunks.ca (Ian Goldberg) Date: Tue, 28 Nov 2006 18:40:28 -0500 Subject: [OTR-dev] Gaim 2.0.0beta4 In-Reply-To: References: <1161363301.15169.6.camel@midnight> <200610240814.24174.wezlo@comcast.net> Message-ID: <20061128234028.GC5869@yoink.cs.uwaterloo.ca> On Tue, Nov 21, 2006 at 06:11:58AM -0500, Greg Troxel wrote: > > for fedora I had to change the path to the gtk include files manually. > > Ian: any change for a configure option for that the gtk2 includes? Fedora > now puts it in /usr/include/gtk-2.0/gtk > > We should be using pkg-config to find include and link paths. NetBSD > pkgsrc puts the includes in /usr/pkg/include/gtk-2.0, but pkg-config > looks right. I don't understand. We *are* using pkg-config (at least when we're not cross-compiling for mingw). Paul, does Fedora's pkg-config not report the correct location for the gtk include files? Or am I misunderstanding your question? - Ian