26583 2009-06-21 06:53:50 -0700 [Gtk] Remove deprecated GTK+ symbols 2009-06-27 22:55:00 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 a9016009 webkit-unassigned jmalonzo pochu27 oldest_to_newest 127216 0 a9016009 2009-06-21 06:53:50 -0700 According to http://www.gnome.org/~fpeters/299.html Webkit uses the following deprecated GTK+ symbols that will be removed for GTK3/GNOME3: gtk_timeout_add, gtk_timeout_remove, gtk_toolbar_set_orientation, gtk_type_class, gtk_type_new Also see http://live.gnome.org/GnomeGoals/RemoveDeprecatedSymbols/GTK%2B See http://library.gnome.org for their replacements. 128288 1 pochu27 2009-06-25 15:05:24 -0700 I'm working on this 128294 2 31880 pochu27 2009-06-25 15:28:46 -0700 Created attachment 31880 Stop using deprecated GTK+ symbols My first WebKit patch! 128345 3 31880 jmalonzo 2009-06-25 17:31:07 -0700 Comment on attachment 31880 Stop using deprecated GTK+ symbols > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index 442178e..add2229 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog > @@ -1,3 +1,15 @@ > +2009-06-25 Emilio Pozuelo Monfort <pochu27@gmail.com> > + > + Reviewed by NOBODY (OOPS!). > + > + [GTK] Don't use deprecated GTK+ symbols. > + https://bugs.webkit.org/show_bug.cgi?id=26583 > + > + * plugins/gtk/gtk2xtbin.c: > + (gtk_xtbin_class_init): > + (gtk_xtbin_new): > + (gtk_xtbin_destroy): > + > 2009-06-25 Dimitri Glazkov <dglazkov@chromium.org> > > Unreviewed, build fix. > diff --git a/WebCore/plugins/gtk/gtk2xtbin.c b/WebCore/plugins/gtk/gtk2xtbin.c > index 8d52aa2..68c5373 100644 > --- a/WebCore/plugins/gtk/gtk2xtbin.c > +++ b/WebCore/plugins/gtk/gtk2xtbin.c > @@ -42,8 +42,6 @@ > * inside a GTK application. > */ > > -#undef GTK_DISABLE_DEPRECATED > - > #include "xembed.h" > #include "gtk2xtbin.h" > #include <gtk/gtk.h> > @@ -246,7 +244,7 @@ gtk_xtbin_class_init (GtkXtBinClass *klass) > GtkWidgetClass *widget_class; > GtkObjectClass *object_class; > > - parent_class = gtk_type_class (GTK_TYPE_SOCKET); > + parent_class = g_type_class_peek_parent (klass); Why the change from GTK_TYPE_SOCKET to klass? Is it safe? 128624 4 pochu27 2009-06-26 18:45:36 -0700 (In reply to comment #3) > Why the change from GTK_TYPE_SOCKET to klass? Is it safe? I'm not a GObject expert, but AFAICS it is. g_type_class_peek_parent (klass) will return klass' parent, which is specified in the g_type_register_static() call a few lines above. So g_type_class_peek_parent (klass) will return a pointer to the GTK_TYPE_SOCKET class, as we were doing before. Still, I wouldn't mind confirmation from a GObject guru :) 128711 5 31880 jmalonzo 2009-06-27 22:17:27 -0700 Comment on attachment 31880 Stop using deprecated GTK+ symbols r=m3 128713 6 jmalonzo 2009-06-27 22:55:00 -0700 (In reply to comment #5) > (From update of attachment 31880 [review]) > r=m3 > Landed in r45319 31880 2009-06-25 15:28:46 -0700 2009-06-27 22:17:27 -0700 Stop using deprecated GTK+ symbols dont_use_deprecated_gtk_symbols.patch text/plain 3325 pochu27 ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDQyMTc4ZS4uYWRkMjIyOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNi0yNSAgRW1pbGlvIFBvenVl bG8gTW9uZm9ydCAgPHBvY2h1MjdAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSBkZXByZWNhdGVkIEdUSysg c3ltYm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI2NTgzCisKKyAgICAgICAgKiBwbHVnaW5zL2d0ay9ndGsyeHRiaW4uYzoKKyAgICAgICAgKGd0 a194dGJpbl9jbGFzc19pbml0KToKKyAgICAgICAgKGd0a194dGJpbl9uZXcpOgorICAgICAgICAo Z3RrX3h0YmluX2Rlc3Ryb3kpOgorCiAyMDA5LTA2LTI1ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xh emtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYnVpbGQgZml4LgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYyBiL1dlYkNvcmUvcGx1Z2lu cy9ndGsvZ3RrMnh0YmluLmMKaW5kZXggOGQ1MmFhMi4uNjhjNTM3MyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYworKysgYi9XZWJDb3JlL3BsdWdpbnMvZ3RrL2d0 azJ4dGJpbi5jCkBAIC00Miw4ICs0Miw2IEBACiAgKiBpbnNpZGUgYSBHVEsgYXBwbGljYXRpb24u ICAKICAqLwogCi0jdW5kZWYgR1RLX0RJU0FCTEVfREVQUkVDQVRFRAotCiAjaW5jbHVkZSAieGVt YmVkLmgiCiAjaW5jbHVkZSAiZ3RrMnh0YmluLmgiCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgpAQCAt MjQ2LDcgKzI0NCw3IEBAIGd0a194dGJpbl9jbGFzc19pbml0IChHdGtYdEJpbkNsYXNzICprbGFz cykKICAgR3RrV2lkZ2V0Q2xhc3MgKndpZGdldF9jbGFzczsKICAgR3RrT2JqZWN0Q2xhc3MgKm9i amVjdF9jbGFzczsKIAotICBwYXJlbnRfY2xhc3MgPSBndGtfdHlwZV9jbGFzcyAoR1RLX1RZUEVf U09DS0VUKTsKKyAgcGFyZW50X2NsYXNzID0gZ190eXBlX2NsYXNzX3BlZWtfcGFyZW50IChrbGFz cyk7CiAKICAgd2lkZ2V0X2NsYXNzID0gR1RLX1dJREdFVF9DTEFTUyAoa2xhc3MpOwogICB3aWRn ZXRfY2xhc3MtPnJlYWxpemUgPSBndGtfeHRiaW5fcmVhbGl6ZTsKQEAgLTMxOSw3ICszMTcsNyBA QCBndGtfeHRiaW5fbmV3IChHZGtXaW5kb3cgKnBhcmVudF93aW5kb3csIFN0cmluZyAqIGYpCiAg IGdwb2ludGVyIHVzZXJfZGF0YTsKIAogICBhc3NlcnQocGFyZW50X3dpbmRvdyAhPSBOVUxMKTsK LSAgeHRiaW4gPSBndGtfdHlwZV9uZXcgKEdUS19UWVBFX1hUQklOKTsKKyAgeHRiaW4gPSBnX29i amVjdF9uZXcgKEdUS19UWVBFX1hUQklOLCBOVUxMKTsKIAogICBpZiAoIXh0YmluKQogICAgIHJl dHVybiAoR3RrV2lkZ2V0KilOVUxMOwpAQCAtMzc3LDggKzM3NSw4IEBAIGd0a194dGJpbl9uZXcg KEdka1dpbmRvdyAqcGFyZW50X3dpbmRvdywgU3RyaW5nICogZikKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgR19QUklPUklUWV9MT1cpOwogICAgIC8qIGFkZCBhIHRpbWVyIHNvIHRoYXQg d2UgY2FuIHBvbGwgYW5kIHByb2Nlc3MgWHQgdGltZXJzICovCiAgICAgeHRfcG9sbGluZ190aW1l cl9pZCA9Ci0gICAgICBndGtfdGltZW91dF9hZGQoMjUsCi0gICAgICAgICAgICAgICAgICAgICAg KEd0a0Z1bmN0aW9uKXh0X2V2ZW50X3BvbGxpbmdfdGltZXJfY2FsbGJhY2ssCisgICAgICBnX3Rp bWVvdXRfYWRkKDI1LAorICAgICAgICAgICAgICAgICAgICAgIChHU291cmNlRnVuYyl4dF9ldmVu dF9wb2xsaW5nX3RpbWVyX2NhbGxiYWNrLAogICAgICAgICAgICAgICAgICAgICAgIHh0ZGlzcGxh eSk7CiAgIH0KIApAQCAtNDk1LDcgKzQ5Myw3IEBAIGd0a194dGJpbl9kZXN0cm95IChHdGtPYmpl Y3QgKm9iamVjdCkKICAgICAgIGdfbWFpbl9jb250ZXh0X3JlbW92ZV9wb2xsKChHTWFpbkNvbnRl eHQqKU5VTEwsICZ4dF9ldmVudF9wb2xsX2ZkKTsKICAgICAgIGdfc291cmNlX3JlbW92ZSh0YWcp OwogCi0gICAgICBndGtfdGltZW91dF9yZW1vdmUoeHRfcG9sbGluZ190aW1lcl9pZCk7CisgICAg ICBnX3NvdXJjZV9yZW1vdmUoeHRfcG9sbGluZ190aW1lcl9pZCk7CiAgICAgICB4dF9wb2xsaW5n X3RpbWVyX2lkID0gMDsKICAgICB9CiAgIH0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5n ZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCBjYmE5NDFlLi5iMDI5YTFiIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDYtMjUgIEVtaWxpbyBQb3p1ZWxvIE1vbmZvcnQgIDxw b2NodTI3QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbR1RLXSBEb24ndCB1c2UgZGVwcmVjYXRlZCBHVEsrIHN5bWJvbHMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjU4MworCisgICAg ICAgICogR3RrTGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAoY3JlYXRlX3Rvb2xiYXIpOgorCiAy MDA5LTA2LTI1ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYyBiL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4u YwppbmRleCA0OGJhOTdlLi4wNjNiMWNiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9HdGtMYXVu Y2hlci9tYWluLmMKKysrIGIvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCkBAIC0xNDAs NyArMTQwLDcgQEAgY3JlYXRlX3Rvb2xiYXIgKCkKIHsKICAgICBHdGtXaWRnZXQqIHRvb2xiYXIg PSBndGtfdG9vbGJhcl9uZXcgKCk7CiAKLSAgICBndGtfdG9vbGJhcl9zZXRfb3JpZW50YXRpb24g KEdUS19UT09MQkFSICh0b29sYmFyKSwgR1RLX09SSUVOVEFUSU9OX0hPUklaT05UQUwpOworICAg IGd0a19vcmllbnRhYmxlX3NldF9vcmllbnRhdGlvbiAoR1RLX09SSUVOVEFCTEUgKHRvb2xiYXIp LCBHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRBTCk7CiAgICAgZ3RrX3Rvb2xiYXJfc2V0X3N0eWxl IChHVEtfVE9PTEJBUiAodG9vbGJhciksIEdUS19UT09MQkFSX0JPVEhfSE9SSVopOwogCiAgICAg R3RrVG9vbEl0ZW0qIGl0ZW07Cg==