patch: utf-8 clean up
lucida <[email protected]> Tue, 18 Nov 2003 09:59:28 -0800
| Newsgroups | gmane.comp.multimedia.beep-media-player.devel |
|---|---|
| Message-ID | <1069178368.14787.8.camel@fancyworld> |
--=-DlDX3lg2JY1lCqdtQs7N Content-Type: text/plain Content-Transfer-Encoding: 7bit This patch should fix *all* the gtk warning msgs. about utf8 things as well as set correct title for bmp. It also contains my last invalid-id3-crash fix. Please test and merge it. thx. lucida --=-DlDX3lg2JY1lCqdtQs7N Content-Disposition: attachment; filename=utf8-clean.diff Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name=utf8-clean.diff; charset= ZGlmZiAtcnVOIGJtcC5vcmlnL2JlZXAvaW5wdXQuYyBibXAucGF0Y2gvYmVlcC9pbnB1dC5jDQot LS0gYm1wLm9yaWcvYmVlcC9pbnB1dC5jCTIwMDMtMTEtMTggMDQ6MjQ6MDkuMDAwMDAwMDAwIC0w ODAwDQorKysgYm1wLnBhdGNoL2JlZXAvaW5wdXQuYwkyMDAzLTExLTE4IDA5OjQ4OjM3LjAwMDAw MDAwMCAtMDgwMA0KQEAgLTI4NCw3ICsyODQsNyBAQA0KIAkJZ3RrX2NvbnRhaW5lcl9hZGQoR1RL X0NPTlRBSU5FUih1bnBsYXlhYmxlc193aW5kb3cpLCB2Ym94KTsNCiAJfQ0KIAkNCi0JbCA9IGdf bGlzdF9hcHBlbmQobCwgZ3RrX2xpc3RfaXRlbV9uZXdfd2l0aF9sYWJlbChmaWxlbmFtZSkpOw0K KwlsID0gZ19saXN0X2FwcGVuZChsLCBndGtfbGlzdF9pdGVtX25ld193aXRoX2xhYmVsKGdfbG9j YWxlX3RvX3V0ZjgoZmlsZW5hbWUsIC0xLCBOVUxMLCBOVUxMLCBOVUxMKSkpOw0KIAlndGtfbGlz dF9hcHBlbmRfaXRlbXMoR1RLX0xJU1QobGlzdCksIGwpOw0KIAkNCiAJZ3RrX3dpZGdldF9zaG93 X2FsbCh1bnBsYXlhYmxlc193aW5kb3cpOw0KZGlmZiAtcnVOIGJtcC5vcmlnL2JlZXAvbWFpbi5j IGJtcC5wYXRjaC9iZWVwL21haW4uYw0KLS0tIGJtcC5vcmlnL2JlZXAvbWFpbi5jCTIwMDMtMTEt MTggMDQ6MjQ6MDkuMDAwMDAwMDAwIC0wODAwDQorKysgYm1wLnBhdGNoL2JlZXAvbWFpbi5jCTIw MDMtMTEtMTggMDk6NDg6MzcuMDAwMDAwMDAwIC0wODAwDQpAQCAtMTAxNiwyNiArMTAxNiwyMiBA QA0KIA0KIAlpZiAobWFpbndpbl9pbmZvX3RleHRfbG9ja2VkKQ0KIAkJcmV0dXJuOw0KLQ0KLQlp ZiAoICh0ZXh0ID0gaW5wdXRfZ2V0X2luZm9fdGV4dCgpKSAhPSBOVUxMKQ0KKwkNCisJDQorCWlm ICggKHRleHQgPSBpbnB1dF9nZXRfaW5mb190ZXh0KCkpICE9IE5VTEwpIA0KIAl7DQogCQl0ZXh0 Ym94X3NldF90ZXh0KG1haW53aW5faW5mbywgdGV4dCk7DQotCQltYWlud2luX3NldF90aXRsZSh0 ZXh0KTsNCiAJfQ0KLQllbHNlIGlmICgodGV4dCA9IHBsYXlsaXN0X2dldF9pbmZvX3RleHQoKSkg IT0gTlVMTCkNCisJZWxzZSBpZiAoKHRleHQgPSBwbGF5bGlzdF9nZXRfaW5mb190ZXh0KCkpICE9 IE5VTEwpIA0KIAl7DQogCQl0ZXh0Ym94X3NldF90ZXh0KG1haW53aW5faW5mbywgdGV4dCk7DQot CQltYWlud2luX3NldF90aXRsZSh0ZXh0KTsNCi0JCWdfZnJlZSh0ZXh0KTsNCiAJfQ0KIAllbHNl DQotCXsNCiAJCXRleHQgPSBnX3N0cmR1cF9wcmludGYoIiVzICVzIiwgUEFDS0FHRSwgVkVSU0lP Tik7DQotCQl0ZXh0Ym94X3NldF90ZXh0KG1haW53aW5faW5mbywgdGV4dCk7DQotCQltYWlud2lu X3NldF90aXRsZSh0ZXh0KTsNCi0JCWdfZnJlZSh0ZXh0KTsNCi0JfQ0KIA0KKwl0ZXh0ID0gZ19s b2NhbGVfdG9fdXRmOCh0ZXh0LCAtMSwgTlVMTCwgTlVMTCwgTlVMTCk7DQorCW1haW53aW5fc2V0 X3RpdGxlKHRleHQpOw0KKwlnX2ZyZWUodGV4dCk7DQogfQ0KIA0KIHZvaWQgbWFpbndpbl9sb2Nr X2luZm9fdGV4dChnY2hhciAqIHRleHQpDQpAQCAtMTEwNiw3ICsxMTAyLDcgQEANCiAJCQlnX2Zy ZWUobWFpbndpbl90aXRsZV90ZXh0KTsNCiANCiAJCS8vIFdpdGhvdXQgdGhlIGFwcCBuYW1lIHBy ZWZpeGVkIGl0J3MgbXVjaCBlYXNpZXIgdG8gc2VlIHdoYXQncyBnb2luZyBvbg0KLQkJbWFpbndp bl90aXRsZV90ZXh0ID0gZ19zdHJkdXBfcHJpbnRmKCJQbGF5aW5nOiAlcyIsIHRtcCk7DQorCQlt YWlud2luX3RpdGxlX3RleHQgPSBnX3N0cmR1cF9wcmludGYoIlBsYXlpbmc6ICVzIiwgZ19sb2Nh bGVfdG9fdXRmOCh0bXAsIC0xLCBOVUxMLCBOVUxMLCBOVUxMKSk7DQogCQlwdGhyZWFkX211dGV4 X3VubG9jaygmdGl0bGVfbXV0ZXgpOw0KIAkJZ19mcmVlKHRtcCk7DQogCX0NCkBAIC0zNDM1LDcg KzM0MzEsOCBAQA0KIAlpZiAobWFpbndpbl90aXRsZV90ZXh0KQ0KIAl7DQogCQlwdGhyZWFkX211 dGV4X2xvY2soJnRpdGxlX211dGV4KTsNCi0JCWd0a193aW5kb3dfc2V0X3RpdGxlKEdUS19XSU5E T1cobWFpbndpbiksIG1haW53aW5fdGl0bGVfdGV4dCk7DQorLy8JCWdka193aW5kb3dfc2V0X3Rp dGxlKEdUS19XSU5ET1cobWFpbndpbiksIG1haW53aW5fdGl0bGVfdGV4dCk7DQorCQltYWlud2lu X3NldF90aXRsZShtYWlud2luX3RpdGxlX3RleHQpOw0KIAkJZ19mcmVlKG1haW53aW5fdGl0bGVf dGV4dCk7DQogCQltYWlud2luX3RpdGxlX3RleHQgPSBOVUxMOw0KIAkJcHRocmVhZF9tdXRleF91 bmxvY2soJnRpdGxlX211dGV4KTsNCmRpZmYgLXJ1TiBibXAub3JpZy9iZWVwL3BsYXlsaXN0LmMg Ym1wLnBhdGNoL2JlZXAvcGxheWxpc3QuYw0KLS0tIGJtcC5vcmlnL2JlZXAvcGxheWxpc3QuYwky MDAzLTExLTE4IDA0OjI0OjA5LjAwMDAwMDAwMCAtMDgwMA0KKysrIGJtcC5wYXRjaC9iZWVwL3Bs YXlsaXN0LmMJMjAwMy0xMS0xOCAwOTo0ODozNy4wMDAwMDAwMDAgLTA4MDANCkBAIC0xMDgzLDcg KzEwODMsNyBAQA0KIA0KIGNoYXIgKnBsYXlsaXN0X2dldF9pbmZvX3RleHQodm9pZCkNCiB7DQot CWNoYXIgKnRleHQsICp0aXRsZSwgKnRtcCwgKm51bWJlcnMsICpsZW5ndGg7DQorCWNoYXIgKnRl eHQsICp0aXRsZSwgKnRtcCwgKm51bWJlcnMsICpsZW5ndGgsICp1dGY4dGl0bGU7DQogDQogCVBM X0xPQ0soKTsNCiAJaWYgKCFwbGF5bGlzdF9wb3NpdGlvbikNCkBAIC0xMDk3LDYgKzEwOTcsOCBA QA0KIAllbHNlDQogCQl0aXRsZSA9IGdfcGF0aF9nZXRfYmFzZW5hbWUocGxheWxpc3RfcG9zaXRp b24tPmZpbGVuYW1lKTsNCiANCisJaWYgKCFnX2xvY2FsZV90b191dGY4KHRpdGxlLCAtMSwgTlVM TCwgTlVMTCwgTlVMTCkpIA0KKwkJdGl0bGUgPSBnX3BhdGhfZ2V0X2Jhc2VuYW1lKHBsYXlsaXN0 X3Bvc2l0aW9uLT5maWxlbmFtZSk7DQogCS8qDQogCSAqIElmIHRoZSB1c2VyIGRvbid0IHdhbnQg bnVtYmVycyBpbiB0aGUgcGxheWxpc3QsIGRvbid0DQogCSAqIGRpc3BsYXkgdGhlbSBpbiBvdGhl ciBwYXJ0cyBvZiBYTU1TDQpAQCAtMTQ0OSw3ICsxNDUxLDcgQEANCiANCiBnY2hhciAqIHBsYXls aXN0X2dldF9zb25ndGl0bGUoZ2ludCBwb3MpDQogew0KLQljaGFyICp0aXRsZSA9IE5VTEwsICpm aWxlbmFtZTsNCisJY2hhciAqdGl0bGUgPSBOVUxMLCAqZmlsZW5hbWUsICp1dGY4dGl0bGU7DQog CVBsYXlsaXN0RW50cnkgKmVudHJ5Ow0KIAlHTGlzdCAqbm9kZTsNCiANCkBAIC0xNDgyLDEwICsx NDg0LDE1IEBADQogCQlQTF9VTkxPQ0soKTsNCiAJfQ0KIA0KKw0KIAlpZiAodGl0bGUgPT0gTlVM TCkNCiAJCXRpdGxlID0gZ19zdHJkdXAoZ19iYXNlbmFtZShmaWxlbmFtZSkpOw0KLQ0KKwkNCisJ dXRmOHRpdGxlID0gZ19sb2NhbGVfdG9fdXRmOCh0aXRsZSwgLTEsIE5VTEwsIE5VTEwsIE5VTEwp Ow0KKwlpZiAoIHV0Zjh0aXRsZSA9PSBOVUxMKSB0aXRsZSA9IGdfc3RyZHVwKGdfYmFzZW5hbWUo ZmlsZW5hbWUpKTsNCisvLwlwcmludGYoIiVzXG4iLCB0aXRsZSk7DQogCWdfZnJlZShmaWxlbmFt ZSk7DQorCWdfZnJlZSh1dGY4dGl0bGUpOw0KIA0KIAlyZXR1cm4gdGl0bGU7DQogfQ0KZGlmZiAt cnVOIGJtcC5vcmlnL2JlZXAvcGxheWxpc3RfbGlzdC5jIGJtcC5wYXRjaC9iZWVwL3BsYXlsaXN0 X2xpc3QuYw0KLS0tIGJtcC5vcmlnL2JlZXAvcGxheWxpc3RfbGlzdC5jCTIwMDMtMTEtMTggMDQ6 MjQ6MDkuMDAwMDAwMDAwIC0wODAwDQorKysgYm1wLnBhdGNoL2JlZXAvcGxheWxpc3RfbGlzdC5j CTIwMDMtMTEtMTggMDk6NDg6MzcuMDAwMDAwMDAwIC0wODAwDQpAQCAtNDMzLDYgKzQzMyw5IEBA DQogCQllbHNlDQogCQkJdGl0bGUgPSBnX2Jhc2VuYW1lKGVudHJ5LT5maWxlbmFtZSk7DQogDQor CQlpZiAoIWdfbG9jYWxlX3RvX3V0ZjgodGl0bGUsIC0xLCBOVUxMLCBOVUxMLCBOVUxMKSkgDQor CQkJdGl0bGUgPSBnX2Jhc2VuYW1lKGVudHJ5LT5maWxlbmFtZSk7DQorDQogCQlwb3MgPSBwbGF5 bGlzdF9nZXRfcXVldWVfcG9zaXRpb24oZW50cnkpOw0KIAkJDQogCQlpZiAocG9zICE9IC0xKQ0K ZGlmZiAtcnVOIGJtcC5vcmlnL2JlZXAvcHJlZnN3aW4uYyBibXAucGF0Y2gvYmVlcC9wcmVmc3dp bi5jDQotLS0gYm1wLm9yaWcvYmVlcC9wcmVmc3dpbi5jCTIwMDMtMTEtMTggMDQ6MjQ6MDkuMDAw MDAwMDAwIC0wODAwDQorKysgYm1wLnBhdGNoL2JlZXAvcHJlZnN3aW4uYwkyMDAzLTExLTE4IDA5 OjQ4OjM3LjAwMDAwMDAwMCAtMDgwMA0KQEAgLTQ0MSw3ICs0NDEsNyBAQA0KIA0KIAlmb250c2Vs ID0gZ3RrX2ZvbnRfc2VsZWN0aW9uX2RpYWxvZ19uZXcoXygiU2VsZWN0IHBsYXlsaXN0IGZvbnQ6 IikpOw0KIA0KLQlndGtfZm9udF9zZWxlY3Rpb25fZGlhbG9nX3NldF9wcmV2aWV3X3RleHQoR1RL X0ZPTlRfU0VMRUNUSU9OX0RJQUxPRyhmb250c2VsKSxwbGF5bGlzdF9nZXRfc29uZ3RpdGxlKGdl dF9wbGF5bGlzdF9wb3NpdGlvbigpKSk7DQorCWd0a19mb250X3NlbGVjdGlvbl9kaWFsb2dfc2V0 X3ByZXZpZXdfdGV4dChHVEtfRk9OVF9TRUxFQ1RJT05fRElBTE9HKGZvbnRzZWwpLGdfbG9jYWxl X3RvX3V0ZjgocGxheWxpc3RfZ2V0X3Nvbmd0aXRsZShnZXRfcGxheWxpc3RfcG9zaXRpb24oKSks IC0xLCBOVUxMLCBOVUxMLCBOVUxMKSk7DQogCWd0a19mb250X3NlbGVjdGlvbl9kaWFsb2dfc2V0 X2ZvbnRfbmFtZShHVEtfRk9OVF9TRUxFQ1RJT05fRElBTE9HKGZvbnRzZWwpLCBjZmcucGxheWxp c3RfZm9udCk7DQogDQogCXJlc3BvbnNlID0gZ3RrX2RpYWxvZ19ydW4oR1RLX0RJQUxPRyhmb250 c2VsKSk7DQo= --=-DlDX3lg2JY1lCqdtQs7N--