47090 2010-10-04 08:49:24 -0700 Don't use GtkObject 2010-10-07 05:44:19 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 cgarcia webkit-unassigned commit-queue webkit.review.bot xan.lopez oldest_to_newest 288952 0 69638 cgarcia 2010-10-04 08:49:24 -0700 Created attachment 69638 Do not use GtkObject GtkObject has been removed in gtk3. It's only used in WebCore/plugins/gtk/gtk2xtbin.c, where we can just use GObjectClass->dispose to make the code compatible with gtk2, and WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp that calls gtk_adjustment_new() which returned a GtkObject in gtk2, but now returns a GtkAdjustment. 289079 1 69638 mrobinson 2010-10-04 12:35:59 -0700 Comment on attachment 69638 Do not use GtkObject View in context: https://bugs.webkit.org/attachment.cgi?id=69638&action=review This change needs a ChangeLog. :) Check the WebKit contributing page for some handy shortcuts wrt to ChangeLogs: http://webkit.org/coding/contributing.html#changelogs > WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp:550 > +#if GTK_CHECK_VERSION (2, 90, 8) > + GtkAdjustment* adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 0.1, 1.0, 1.0); > +#else > + GtkAdjustment* adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 100.0, 0.1, 1.0, 1.0)); > +#endif > + m_timeHScale = gtk_hscale_new(adjustment); > gtk_scale_set_draw_value(GTK_SCALE(m_timeHScale), FALSE); I think in this case, the extra cast is worth getting preventing #ifdefs here. 290135 2 69898 cgarcia 2010-10-06 01:25:22 -0700 Created attachment 69898 Updated patch to remove gtkobject Updated patch including ChangeLog entry and another use of gtkobject I missed in WebCoreSupport/EditorClientGtk.cpp 290136 3 webkit.review.bot 2010-10-06 01:26:26 -0700 Attachment 69898 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/plugins/gtk/gtk2xtbin.c:75: Extra space before ( in function call [whitespace/parens] [4] WebCore/plugins/gtk/gtk2xtbin.c:75: gtk_xtbin_dispose is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebCore/plugins/gtk/gtk2xtbin.c:247: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:247: Extra space between GObjectClass and *object_class [whitespace/declaration] [3] WebCore/plugins/gtk/gtk2xtbin.c:255: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:255: Extra space before ( in function call [whitespace/parens] [4] WebCore/plugins/gtk/gtk2xtbin.c:256: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:483: Extra space before ( in function call [whitespace/parens] [4] WebCore/plugins/gtk/gtk2xtbin.c:517: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 9 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 290903 4 69898 xan.lopez 2010-10-07 03:14:27 -0700 Comment on attachment 69898 Updated patch to remove gtkobject View in context: https://bugs.webkit.org/attachment.cgi?id=69898&action=review Patch looks good otherwise. > WebCore/ChangeLog:12 > + No new tests. (OOPS!) You need to remove this or the cq will fail to apply the patch. And need to regenerate the ChangeLog. 290909 5 70065 cgarcia 2010-10-07 03:49:04 -0700 Created attachment 70065 Another update Fixes Changelog formatting issues 290910 6 webkit.review.bot 2010-10-07 03:51:13 -0700 Attachment 70065 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/plugins/gtk/gtk2xtbin.c:75: Extra space before ( in function call [whitespace/parens] [4] WebCore/plugins/gtk/gtk2xtbin.c:75: gtk_xtbin_dispose is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebCore/plugins/gtk/gtk2xtbin.c:247: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:247: Extra space between GObjectClass and *object_class [whitespace/declaration] [3] WebCore/plugins/gtk/gtk2xtbin.c:255: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:255: Extra space before ( in function call [whitespace/parens] [4] WebCore/plugins/gtk/gtk2xtbin.c:256: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:483: Extra space before ( in function call [whitespace/parens] [4] WebCore/plugins/gtk/gtk2xtbin.c:517: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 9 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 290911 7 70065 xan.lopez 2010-10-07 03:53:07 -0700 Comment on attachment 70065 Another update r=me 290938 8 70065 commit-queue 2010-10-07 05:44:13 -0700 Comment on attachment 70065 Another update Clearing flags on attachment: 70065 Committed r69301: <http://trac.webkit.org/changeset/69301> 290939 9 commit-queue 2010-10-07 05:44:19 -0700 All reviewed patches have been landed. Closing bug. 69638 2010-10-04 08:49:24 -0700 2010-10-06 01:25:22 -0700 Do not use GtkObject gtkobject.diff text/plain 2768 cgarcia ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMgYi9XZWJDb3JlL3Bs dWdpbnMvZ3RrL2d0azJ4dGJpbi5jCmluZGV4IGEwODA4ZDkuLmFiMTJjYWUgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMKKysrIGIvV2ViQ29yZS9wbHVnaW5zL2d0 ay9ndGsyeHRiaW4uYwpAQCAtNzIsNyArNzIsNyBAQCBzdGF0aWMgdm9pZCAgICAgICAgICAgIGd0 a194dGJpbl9jbGFzc19pbml0IChHdGtYdEJpbkNsYXNzICprbGFzcyk7CiBzdGF0aWMgdm9pZCAg ICAgICAgICAgIGd0a194dGJpbl9pbml0ICAgICAgIChHdGtYdEJpbiAgICAgICp4dGJpbik7CiBz dGF0aWMgdm9pZCAgICAgICAgICAgIGd0a194dGJpbl9yZWFsaXplICAgIChHdGtXaWRnZXQgICAg ICAqd2lkZ2V0KTsKIHN0YXRpYyB2b2lkICAgICAgICAgICAgZ3RrX3h0YmluX3VucmVhbGl6ZSAg ICAoR3RrV2lkZ2V0ICAgICAgKndpZGdldCk7Ci1zdGF0aWMgdm9pZCAgICAgICAgICAgIGd0a194 dGJpbl9kZXN0cm95ICAgIChHdGtPYmplY3QgICAgICAqb2JqZWN0KTsKK3N0YXRpYyB2b2lkICAg ICAgICAgICAgZ3RrX3h0YmluX2Rpc3Bvc2UgICAgKEdPYmplY3QgICAgICAqb2JqZWN0KTsKIAog LyogWHQgYXdhcmUgWEVtYmVkICovCiBzdGF0aWMgdm9pZCAgICAgICB4dF9jbGllbnRfaW5pdCAg ICAgIChYdENsaWVudCAqIHh0Y2xpZW50LCAKQEAgLTI0NCw3ICsyNDQsNyBAQCBzdGF0aWMgdm9p ZAogZ3RrX3h0YmluX2NsYXNzX2luaXQgKEd0a1h0QmluQ2xhc3MgKmtsYXNzKQogewogICBHdGtX aWRnZXRDbGFzcyAqd2lkZ2V0X2NsYXNzOwotICBHdGtPYmplY3RDbGFzcyAqb2JqZWN0X2NsYXNz OworICBHT2JqZWN0Q2xhc3MgICAqb2JqZWN0X2NsYXNzOwogCiAgIHBhcmVudF9jbGFzcyA9IGdf dHlwZV9jbGFzc19wZWVrX3BhcmVudCAoa2xhc3MpOwogCkBAIC0yNTIsOCArMjUyLDggQEAgZ3Rr X3h0YmluX2NsYXNzX2luaXQgKEd0a1h0QmluQ2xhc3MgKmtsYXNzKQogICB3aWRnZXRfY2xhc3Mt PnJlYWxpemUgPSBndGtfeHRiaW5fcmVhbGl6ZTsKICAgd2lkZ2V0X2NsYXNzLT51bnJlYWxpemUg PSBndGtfeHRiaW5fdW5yZWFsaXplOwogCi0gIG9iamVjdF9jbGFzcyA9IEdUS19PQkpFQ1RfQ0xB U1MgKGtsYXNzKTsKLSAgb2JqZWN0X2NsYXNzLT5kZXN0cm95ID0gZ3RrX3h0YmluX2Rlc3Ryb3k7 CisgIG9iamVjdF9jbGFzcyA9IEdfT0JKRUNUX0NMQVNTIChrbGFzcyk7CisgIG9iamVjdF9jbGFz cy0+ZGlzcG9zZSA9IGd0a194dGJpbl9kaXNwb3NlOwogfQogCiBzdGF0aWMgdm9pZApAQCAtNDgw LDcgKzQ4MCw3IEBAIGd0a194dGJpbl91bnJlYWxpemUgKEd0a1dpZGdldCAqb2JqZWN0KQogfQog CiBzdGF0aWMgdm9pZAotZ3RrX3h0YmluX2Rlc3Ryb3kgKEd0a09iamVjdCAqb2JqZWN0KQorZ3Rr X3h0YmluX2Rpc3Bvc2UgKEdPYmplY3QgKm9iamVjdCkKIHsKICAgR3RrWHRCaW4gKnh0YmluOwog CkBAIC01MTQsNyArNTE0LDcgQEAgZ3RrX3h0YmluX2Rlc3Ryb3kgKEd0a09iamVjdCAqb2JqZWN0 KQogICAgIH0KICAgfQogCi0gIEdUS19PQkpFQ1RfQ0xBU1MocGFyZW50X2NsYXNzKS0+ZGVzdHJv eShvYmplY3QpOworICBHX09CSkVDVF9DTEFTUyhwYXJlbnRfY2xhc3MpLT5kaXNwb3NlKG9iamVj dCk7CiB9CiAKIC8qCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Z1bGxz Y3JlZW5WaWRlb0NvbnRyb2xsZXIuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GdWxs c2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcAppbmRleCAwMWJjMDNhLi40ZDcwMmQ0IDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Z1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXIu Y3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnVsbHNjcmVlblZpZGVvQ29udHJv bGxlci5jcHAKQEAgLTU0MSw4ICs1NDEsMTIgQEAgdm9pZCBGdWxsc2NyZWVuVmlkZW9Db250cm9s bGVyOjpjcmVhdGVIdWQoKQogICAgIEd0a1dpZGdldCogbGFiZWwgPSBndGtfbGFiZWxfbmV3KF8o IlRpbWU6IikpOwogICAgIGd0a19ib3hfcGFja19zdGFydChHVEtfQk9YKGhib3gpLCBsYWJlbCwg RkFMU0UsIFRSVUUsIDApOwogCi0gICAgR3RrT2JqZWN0KiBhZGp1c3RtZW50ID0gZ3RrX2FkanVz dG1lbnRfbmV3KDAuMCwgMC4wLCAxMDAuMCwgMC4xLCAxLjAsIDEuMCk7Ci0gICAgbV90aW1lSFNj YWxlID0gZ3RrX2hzY2FsZV9uZXcoR1RLX0FESlVTVE1FTlQoYWRqdXN0bWVudCkpOworI2lmIEdU S19DSEVDS19WRVJTSU9OICgyLCA5MCwgOCkKKyAgICBHdGtBZGp1c3RtZW50KiBhZGp1c3RtZW50 ID0gZ3RrX2FkanVzdG1lbnRfbmV3KDAuMCwgMC4wLCAxMDAuMCwgMC4xLCAxLjAsIDEuMCk7Cisj ZWxzZQorICAgIEd0a0FkanVzdG1lbnQqIGFkanVzdG1lbnQgPSBHVEtfQURKVVNUTUVOVChndGtf YWRqdXN0bWVudF9uZXcoMC4wLCAwLjAsIDEwMC4wLCAwLjEsIDEuMCwgMS4wKSk7CisjZW5kaWYK KyAgICBtX3RpbWVIU2NhbGUgPSBndGtfaHNjYWxlX25ldyhhZGp1c3RtZW50KTsKICAgICBndGtf c2NhbGVfc2V0X2RyYXdfdmFsdWUoR1RLX1NDQUxFKG1fdGltZUhTY2FsZSksIEZBTFNFKTsKICAg ICBndGtfcmFuZ2Vfc2V0X3Nob3dfZmlsbF9sZXZlbChHVEtfUkFOR0UobV90aW1lSFNjYWxlKSwg VFJVRSk7CiAgICAgZ3RrX3JhbmdlX3NldF91cGRhdGVfcG9saWN5KEdUS19SQU5HRShtX3RpbWVI U2NhbGUpLCBHVEtfVVBEQVRFX0NPTlRJTlVPVVMpOwo= 69898 2010-10-06 01:25:22 -0700 2010-10-07 03:49:04 -0700 Updated patch to remove gtkobject remove-gtk-object.diff text/plain 4770 cgarcia ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzI2MWI0MS4uNjkxNDZkNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMC0wNiAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRG8gbm90IHVzZSBHdGtPYmplY3QKKworICAgICAgICBH dGtPYmplY3QgaGFzIGJlZW4gcmVtb3ZlZCBpbiBndGszLgorCisgICAgICAgIERvbid0IHVzZSBH dGtPYmplY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ3MDkwCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBwbHVn aW5zL2d0ay9ndGsyeHRiaW4uYzoKKyAgICAgICAgKGd0a194dGJpbl9jbGFzc19pbml0KToKKyAg ICAgICAgKGd0a194dGJpbl91bnJlYWxpemUpOgorICAgICAgICAoZ3RrX3h0YmluX2Rpc3Bvc2Up OgorCiAyMDEwLTEwLTAxICBWaW5jZW50IFNjaGVpYiAgPHNjaGVpYkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJLaXQv Z3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IGM2MDJhYzEuLjg0YmNm YmUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIERvIG5vdCB1c2UgR3RrT2JqZWN0CisKKyAgICAgICAgR3RrT2JqZWN0 IGhhcyBiZWVuIHJlbW92ZWQgaW4gZ3RrMy4KKworICAgICAgICBEb24ndCB1c2UgR3RrT2JqZWN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzA5MAor CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcDoKKyAgICAgICAg KFdlYktpdDo6RWRpdG9yQ2xpZW50OjpnZW5lcmF0ZUVkaXRvckNvbW1hbmRzKToKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcDoKKyAgICAgICAg KEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6OmNyZWF0ZUh1ZCk6CisKIDIwMTAtMDktMjggIEpl bm4gQnJhaXRod2FpdGUgIDxqZW5uYkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRG1pdHJ5IFRpdG92LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRi aW4uYyBiL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMKaW5kZXggYTA4MDhkOS4uYWIx MmNhZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYworKysgYi9X ZWJDb3JlL3BsdWdpbnMvZ3RrL2d0azJ4dGJpbi5jCkBAIC03Miw3ICs3Miw3IEBAIHN0YXRpYyB2 b2lkICAgICAgICAgICAgZ3RrX3h0YmluX2NsYXNzX2luaXQgKEd0a1h0QmluQ2xhc3MgKmtsYXNz KTsKIHN0YXRpYyB2b2lkICAgICAgICAgICAgZ3RrX3h0YmluX2luaXQgICAgICAgKEd0a1h0Qmlu ICAgICAgKnh0YmluKTsKIHN0YXRpYyB2b2lkICAgICAgICAgICAgZ3RrX3h0YmluX3JlYWxpemUg ICAgKEd0a1dpZGdldCAgICAgICp3aWRnZXQpOwogc3RhdGljIHZvaWQgICAgICAgICAgICBndGtf eHRiaW5fdW5yZWFsaXplICAgIChHdGtXaWRnZXQgICAgICAqd2lkZ2V0KTsKLXN0YXRpYyB2b2lk ICAgICAgICAgICAgZ3RrX3h0YmluX2Rlc3Ryb3kgICAgKEd0a09iamVjdCAgICAgICpvYmplY3Qp Oworc3RhdGljIHZvaWQgICAgICAgICAgICBndGtfeHRiaW5fZGlzcG9zZSAgICAoR09iamVjdCAg ICAgICpvYmplY3QpOwogCiAvKiBYdCBhd2FyZSBYRW1iZWQgKi8KIHN0YXRpYyB2b2lkICAgICAg IHh0X2NsaWVudF9pbml0ICAgICAgKFh0Q2xpZW50ICogeHRjbGllbnQsIApAQCAtMjQ0LDcgKzI0 NCw3IEBAIHN0YXRpYyB2b2lkCiBndGtfeHRiaW5fY2xhc3NfaW5pdCAoR3RrWHRCaW5DbGFzcyAq a2xhc3MpCiB7CiAgIEd0a1dpZGdldENsYXNzICp3aWRnZXRfY2xhc3M7Ci0gIEd0a09iamVjdENs YXNzICpvYmplY3RfY2xhc3M7CisgIEdPYmplY3RDbGFzcyAgICpvYmplY3RfY2xhc3M7CiAKICAg cGFyZW50X2NsYXNzID0gZ190eXBlX2NsYXNzX3BlZWtfcGFyZW50IChrbGFzcyk7CiAKQEAgLTI1 Miw4ICsyNTIsOCBAQCBndGtfeHRiaW5fY2xhc3NfaW5pdCAoR3RrWHRCaW5DbGFzcyAqa2xhc3Mp CiAgIHdpZGdldF9jbGFzcy0+cmVhbGl6ZSA9IGd0a194dGJpbl9yZWFsaXplOwogICB3aWRnZXRf Y2xhc3MtPnVucmVhbGl6ZSA9IGd0a194dGJpbl91bnJlYWxpemU7CiAKLSAgb2JqZWN0X2NsYXNz ID0gR1RLX09CSkVDVF9DTEFTUyAoa2xhc3MpOwotICBvYmplY3RfY2xhc3MtPmRlc3Ryb3kgPSBn dGtfeHRiaW5fZGVzdHJveTsKKyAgb2JqZWN0X2NsYXNzID0gR19PQkpFQ1RfQ0xBU1MgKGtsYXNz KTsKKyAgb2JqZWN0X2NsYXNzLT5kaXNwb3NlID0gZ3RrX3h0YmluX2Rpc3Bvc2U7CiB9CiAKIHN0 YXRpYyB2b2lkCkBAIC00ODAsNyArNDgwLDcgQEAgZ3RrX3h0YmluX3VucmVhbGl6ZSAoR3RrV2lk Z2V0ICpvYmplY3QpCiB9CiAKIHN0YXRpYyB2b2lkCi1ndGtfeHRiaW5fZGVzdHJveSAoR3RrT2Jq ZWN0ICpvYmplY3QpCitndGtfeHRiaW5fZGlzcG9zZSAoR09iamVjdCAqb2JqZWN0KQogewogICBH dGtYdEJpbiAqeHRiaW47CiAKQEAgLTUxNCw3ICs1MTQsNyBAQCBndGtfeHRiaW5fZGVzdHJveSAo R3RrT2JqZWN0ICpvYmplY3QpCiAgICAgfQogICB9CiAKLSAgR1RLX09CSkVDVF9DTEFTUyhwYXJl bnRfY2xhc3MpLT5kZXN0cm95KG9iamVjdCk7CisgIEdfT0JKRUNUX0NMQVNTKHBhcmVudF9jbGFz cyktPmRpc3Bvc2Uob2JqZWN0KTsKIH0KIAogLyoKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBv cnQvRWRpdG9yQ2xpZW50R3RrLmNwcAppbmRleCBkNGU3MGI2Li43NDllZmU5IDEwMDY0NAotLS0g YS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHAKKysrIGIvV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRHdGsuY3BwCkBAIC01NTcsNyArNTU3 LDExIEBAIHZvaWQgRWRpdG9yQ2xpZW50OjpnZW5lcmF0ZUVkaXRvckNvbW1hbmRzKGNvbnN0IEtl eWJvYXJkRXZlbnQqIGV2ZW50KQogICAgIG1fcGVuZGluZ0VkaXRvckNvbW1hbmRzLmNsZWFyKCk7 CiAKICAgICAvLyBGaXJzdCB0cnkgdG8gaW50ZXJwcmV0IHRoZSBjb21tYW5kIGFzIGEgbmF0aXZl IEdUSysga2V5IGJpbmRpbmcuCisjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKICAgICBndGtfYmlu ZGluZ3NfYWN0aXZhdGVfZXZlbnQoR1RLX09CSkVDVChtX25hdGl2ZVdpZGdldC5nZXQoKSksIGV2 ZW50LT5rZXlFdmVudCgpLT5nZGtFdmVudEtleSgpKTsKKyNlbHNlCisgICAgZ3RrX2JpbmRpbmdz X2FjdGl2YXRlX2V2ZW50KEdfT0JKRUNUKG1fbmF0aXZlV2lkZ2V0LmdldCgpKSwgZXZlbnQtPmtl eUV2ZW50KCktPmdka0V2ZW50S2V5KCkpOworI2VuZGlmCiAgICAgaWYgKG1fcGVuZGluZ0VkaXRv ckNvbW1hbmRzLnNpemUoKSA+IDApCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcCBiL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKaW5k ZXggMDFiYzAzYS4uMzAyZjAyOCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0Z1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXIuY3BwCkBAIC01NDEsOCArNTQxLDggQEAg dm9pZCBGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyOjpjcmVhdGVIdWQoKQogICAgIEd0a1dpZGdl dCogbGFiZWwgPSBndGtfbGFiZWxfbmV3KF8oIlRpbWU6IikpOwogICAgIGd0a19ib3hfcGFja19z dGFydChHVEtfQk9YKGhib3gpLCBsYWJlbCwgRkFMU0UsIFRSVUUsIDApOwogCi0gICAgR3RrT2Jq ZWN0KiBhZGp1c3RtZW50ID0gZ3RrX2FkanVzdG1lbnRfbmV3KDAuMCwgMC4wLCAxMDAuMCwgMC4x LCAxLjAsIDEuMCk7Ci0gICAgbV90aW1lSFNjYWxlID0gZ3RrX2hzY2FsZV9uZXcoR1RLX0FESlVT VE1FTlQoYWRqdXN0bWVudCkpOworICAgIEd0a0FkanVzdG1lbnQqIGFkanVzdG1lbnQgPSBHVEtf QURKVVNUTUVOVChndGtfYWRqdXN0bWVudF9uZXcoMC4wLCAwLjAsIDEwMC4wLCAwLjEsIDEuMCwg MS4wKSk7CisgICAgbV90aW1lSFNjYWxlID0gZ3RrX2hzY2FsZV9uZXcoYWRqdXN0bWVudCk7CiAg ICAgZ3RrX3NjYWxlX3NldF9kcmF3X3ZhbHVlKEdUS19TQ0FMRShtX3RpbWVIU2NhbGUpLCBGQUxT RSk7CiAgICAgZ3RrX3JhbmdlX3NldF9zaG93X2ZpbGxfbGV2ZWwoR1RLX1JBTkdFKG1fdGltZUhT Y2FsZSksIFRSVUUpOwogICAgIGd0a19yYW5nZV9zZXRfdXBkYXRlX3BvbGljeShHVEtfUkFOR0Uo bV90aW1lSFNjYWxlKSwgR1RLX1VQREFURV9DT05USU5VT1VTKTsK 70065 2010-10-07 03:49:04 -0700 2010-10-07 05:44:13 -0700 Another update gtkobject.diff text/plain 4653 cgarcia ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzI2MWI0MS4uMGIyNzZkMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMC0wNyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRG9uJ3QgdXNlIEd0a09iamVjdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcwOTAKKworICAgICAg ICBHdGtPYmplY3QgaGFzIGJlZW4gcmVtb3ZlZCBpbiBndGszLgorCisgICAgICAgICogcGx1Z2lu cy9ndGsvZ3RrMnh0YmluLmM6CisgICAgICAgIChndGtfeHRiaW5fY2xhc3NfaW5pdCk6CisgICAg ICAgIChndGtfeHRiaW5fZGlzcG9zZSk6CisKIDIwMTAtMTAtMDEgIFZpbmNlbnQgU2NoZWliICA8 c2NoZWliQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNv bi4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VM b2cKaW5kZXggYzYwMmFjMS4uMzNlM2M0YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMC0w NyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRG9uJ3QgdXNlIEd0 a09iamVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDcwOTAKKworICAgICAgICBHdGtPYmplY3QgaGFzIGJlZW4gcmVtb3ZlZCBpbiBndGszLgorCisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdl YktpdDo6RWRpdG9yQ2xpZW50OjpnZW5lcmF0ZUVkaXRvckNvbW1hbmRzKToKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKEZ1 bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6OmNyZWF0ZUh1ZCk6CisKIDIwMTAtMDktMjggIEplbm4g QnJhaXRod2FpdGUgIDxqZW5uYkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RG1pdHJ5IFRpdG92LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4u YyBiL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMKaW5kZXggYTA4MDhkOS4uYWIxMmNh ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYworKysgYi9XZWJD b3JlL3BsdWdpbnMvZ3RrL2d0azJ4dGJpbi5jCkBAIC03Miw3ICs3Miw3IEBAIHN0YXRpYyB2b2lk ICAgICAgICAgICAgZ3RrX3h0YmluX2NsYXNzX2luaXQgKEd0a1h0QmluQ2xhc3MgKmtsYXNzKTsK IHN0YXRpYyB2b2lkICAgICAgICAgICAgZ3RrX3h0YmluX2luaXQgICAgICAgKEd0a1h0QmluICAg ICAgKnh0YmluKTsKIHN0YXRpYyB2b2lkICAgICAgICAgICAgZ3RrX3h0YmluX3JlYWxpemUgICAg KEd0a1dpZGdldCAgICAgICp3aWRnZXQpOwogc3RhdGljIHZvaWQgICAgICAgICAgICBndGtfeHRi aW5fdW5yZWFsaXplICAgIChHdGtXaWRnZXQgICAgICAqd2lkZ2V0KTsKLXN0YXRpYyB2b2lkICAg ICAgICAgICAgZ3RrX3h0YmluX2Rlc3Ryb3kgICAgKEd0a09iamVjdCAgICAgICpvYmplY3QpOwor c3RhdGljIHZvaWQgICAgICAgICAgICBndGtfeHRiaW5fZGlzcG9zZSAgICAoR09iamVjdCAgICAg ICpvYmplY3QpOwogCiAvKiBYdCBhd2FyZSBYRW1iZWQgKi8KIHN0YXRpYyB2b2lkICAgICAgIHh0 X2NsaWVudF9pbml0ICAgICAgKFh0Q2xpZW50ICogeHRjbGllbnQsIApAQCAtMjQ0LDcgKzI0NCw3 IEBAIHN0YXRpYyB2b2lkCiBndGtfeHRiaW5fY2xhc3NfaW5pdCAoR3RrWHRCaW5DbGFzcyAqa2xh c3MpCiB7CiAgIEd0a1dpZGdldENsYXNzICp3aWRnZXRfY2xhc3M7Ci0gIEd0a09iamVjdENsYXNz ICpvYmplY3RfY2xhc3M7CisgIEdPYmplY3RDbGFzcyAgICpvYmplY3RfY2xhc3M7CiAKICAgcGFy ZW50X2NsYXNzID0gZ190eXBlX2NsYXNzX3BlZWtfcGFyZW50IChrbGFzcyk7CiAKQEAgLTI1Miw4 ICsyNTIsOCBAQCBndGtfeHRiaW5fY2xhc3NfaW5pdCAoR3RrWHRCaW5DbGFzcyAqa2xhc3MpCiAg IHdpZGdldF9jbGFzcy0+cmVhbGl6ZSA9IGd0a194dGJpbl9yZWFsaXplOwogICB3aWRnZXRfY2xh c3MtPnVucmVhbGl6ZSA9IGd0a194dGJpbl91bnJlYWxpemU7CiAKLSAgb2JqZWN0X2NsYXNzID0g R1RLX09CSkVDVF9DTEFTUyAoa2xhc3MpOwotICBvYmplY3RfY2xhc3MtPmRlc3Ryb3kgPSBndGtf eHRiaW5fZGVzdHJveTsKKyAgb2JqZWN0X2NsYXNzID0gR19PQkpFQ1RfQ0xBU1MgKGtsYXNzKTsK KyAgb2JqZWN0X2NsYXNzLT5kaXNwb3NlID0gZ3RrX3h0YmluX2Rpc3Bvc2U7CiB9CiAKIHN0YXRp YyB2b2lkCkBAIC00ODAsNyArNDgwLDcgQEAgZ3RrX3h0YmluX3VucmVhbGl6ZSAoR3RrV2lkZ2V0 ICpvYmplY3QpCiB9CiAKIHN0YXRpYyB2b2lkCi1ndGtfeHRiaW5fZGVzdHJveSAoR3RrT2JqZWN0 ICpvYmplY3QpCitndGtfeHRiaW5fZGlzcG9zZSAoR09iamVjdCAqb2JqZWN0KQogewogICBHdGtY dEJpbiAqeHRiaW47CiAKQEAgLTUxNCw3ICs1MTQsNyBAQCBndGtfeHRiaW5fZGVzdHJveSAoR3Rr T2JqZWN0ICpvYmplY3QpCiAgICAgfQogICB9CiAKLSAgR1RLX09CSkVDVF9DTEFTUyhwYXJlbnRf Y2xhc3MpLT5kZXN0cm95KG9iamVjdCk7CisgIEdfT0JKRUNUX0NMQVNTKHBhcmVudF9jbGFzcykt PmRpc3Bvc2Uob2JqZWN0KTsKIH0KIAogLyoKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv RWRpdG9yQ2xpZW50R3RrLmNwcAppbmRleCBkNGU3MGI2Li43NDllZmU5IDEwMDY0NAotLS0gYS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRHdGsuY3BwCkBAIC01NTcsNyArNTU3LDEx IEBAIHZvaWQgRWRpdG9yQ2xpZW50OjpnZW5lcmF0ZUVkaXRvckNvbW1hbmRzKGNvbnN0IEtleWJv YXJkRXZlbnQqIGV2ZW50KQogICAgIG1fcGVuZGluZ0VkaXRvckNvbW1hbmRzLmNsZWFyKCk7CiAK ICAgICAvLyBGaXJzdCB0cnkgdG8gaW50ZXJwcmV0IHRoZSBjb21tYW5kIGFzIGEgbmF0aXZlIEdU Sysga2V5IGJpbmRpbmcuCisjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKICAgICBndGtfYmluZGlu Z3NfYWN0aXZhdGVfZXZlbnQoR1RLX09CSkVDVChtX25hdGl2ZVdpZGdldC5nZXQoKSksIGV2ZW50 LT5rZXlFdmVudCgpLT5nZGtFdmVudEtleSgpKTsKKyNlbHNlCisgICAgZ3RrX2JpbmRpbmdzX2Fj dGl2YXRlX2V2ZW50KEdfT0JKRUNUKG1fbmF0aXZlV2lkZ2V0LmdldCgpKSwgZXZlbnQtPmtleUV2 ZW50KCktPmdka0V2ZW50S2V5KCkpOworI2VuZGlmCiAgICAgaWYgKG1fcGVuZGluZ0VkaXRvckNv bW1hbmRzLnNpemUoKSA+IDApCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcCBiL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKaW5kZXgg MDFiYzAzYS4uMzAyZjAyOCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9G dWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0Z1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXIuY3BwCkBAIC01NDEsOCArNTQxLDggQEAgdm9p ZCBGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyOjpjcmVhdGVIdWQoKQogICAgIEd0a1dpZGdldCog bGFiZWwgPSBndGtfbGFiZWxfbmV3KF8oIlRpbWU6IikpOwogICAgIGd0a19ib3hfcGFja19zdGFy dChHVEtfQk9YKGhib3gpLCBsYWJlbCwgRkFMU0UsIFRSVUUsIDApOwogCi0gICAgR3RrT2JqZWN0 KiBhZGp1c3RtZW50ID0gZ3RrX2FkanVzdG1lbnRfbmV3KDAuMCwgMC4wLCAxMDAuMCwgMC4xLCAx LjAsIDEuMCk7Ci0gICAgbV90aW1lSFNjYWxlID0gZ3RrX2hzY2FsZV9uZXcoR1RLX0FESlVTVE1F TlQoYWRqdXN0bWVudCkpOworICAgIEd0a0FkanVzdG1lbnQqIGFkanVzdG1lbnQgPSBHVEtfQURK VVNUTUVOVChndGtfYWRqdXN0bWVudF9uZXcoMC4wLCAwLjAsIDEwMC4wLCAwLjEsIDEuMCwgMS4w KSk7CisgICAgbV90aW1lSFNjYWxlID0gZ3RrX2hzY2FsZV9uZXcoYWRqdXN0bWVudCk7CiAgICAg Z3RrX3NjYWxlX3NldF9kcmF3X3ZhbHVlKEdUS19TQ0FMRShtX3RpbWVIU2NhbGUpLCBGQUxTRSk7 CiAgICAgZ3RrX3JhbmdlX3NldF9zaG93X2ZpbGxfbGV2ZWwoR1RLX1JBTkdFKG1fdGltZUhTY2Fs ZSksIFRSVUUpOwogICAgIGd0a19yYW5nZV9zZXRfdXBkYXRlX3BvbGljeShHVEtfUkFOR0UobV90 aW1lSFNjYWxlKSwgR1RLX1VQREFURV9DT05USU5VT1VTKTsK