26835 2009-06-30 04:04:49 -0700 [GTK] GtkLauncher depends on gtk+2-2.15 because of gtk_orientable_set_orientation() 2009-06-30 19:28:35 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 camaradetux webkit-unassigned oldest_to_newest 129026 0 camaradetux 2009-06-30 04:04:49 -0700 Currently, compilation of GtkLauncher will fail if gtk+2 >= 2.15 isn't available because of gtk_orientable_set_orientation(). That bug was introduced in r45319 (bug #26583) 129027 1 32048 camaradetux 2009-06-30 04:07:10 -0700 Created attachment 32048 Patch to revert to "previous" (pre 2.15) api call The patch partially reverts the patch from 26583 (landed in r45319) which removed api calls which will be deprecated in gtk+3. Wrapping that in #ifdef...#else...#endif looks like a nice solution (I'd done it if I had known what to check for). 129032 2 32050 camaradetux 2009-06-30 04:41:20 -0700 Created attachment 32050 Use new api for gtk+2 >= 2.15.0, old otherwise Updated patch which use GTk_CHECK_VERSION to use the new code when gtk+2 >= 2.15 is used, the old one instead. Also, the former patch had the end of its lines truncated. 129035 3 32050 jmalonzo 2009-06-30 04:51:24 -0700 Comment on attachment 32050 Use new api for gtk+2 >= 2.15.0, old otherwise > +#if GTK_CHECK_VERSION(2,15,0) > gtk_orientable_set_orientation (GTK_ORIENTABLE (toolbar), GTK_ORIENTATION_HORIZONTAL); > +#else > + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL); > +#endif The spacing should be fixed before landing. r=me. 129237 4 jmalonzo 2009-06-30 19:28:35 -0700 (In reply to comment #3) > (From update of attachment 32050 [review]) > > +#if GTK_CHECK_VERSION(2,15,0) > > gtk_orientable_set_orientation (GTK_ORIENTABLE (toolbar), GTK_ORIENTATION_HORIZONTAL); > > +#else > > + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL); > > +#endif > > The spacing should be fixed before landing. r=me. > Landed in r45415. 32048 2009-06-30 04:07:10 -0700 2009-06-30 04:41:20 -0700 Patch to revert to "previous" (pre 2.15) api call gtk-toolbar-orientation.patch text/plain 535 camaradetux ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYyBiL1dlYktpdFRvb2xz L0d0a0xhdW5jaGVyL21haW4uYwppbmRleCAwNjNiMWNiLi43NTE1MDNhIDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKKysrIGIvV2ViS2l0VG9vbHMvR3RrTGF1bmNo ZXIvbWFpbi5jCkBAIC0xNDAsNyArMTQwLDcgQEAgY3JlYXRlX3Rvb2xiYXIgKCkKIHsKICAgICBH dGtXaWRnZXQqIHRvb2xiYXIgPSBndGtfdG9vbGJhcl9uZXcgKCk7CiAKLSAgICBndGtfb3JpZW50 YWJsZV9zZXRfb3JpZW50YXRpb24gKEdUS19PUklFTlRBQkxFICh0b29sYmFyKSwgR1RLX09SSUVO VEFUSU9OX0gKKyAgICBndGtfdG9vbGJhcl9zZXRfb3JpZW50YXRpb24oR1RLX1RPT0xCQVIodG9v bGJhciksIEdUS19PUklFTlRBVElPTl9IT1JJWk9OVEEKICAgICBndGtfdG9vbGJhcl9zZXRfc3R5 bGUgKEdUS19UT09MQkFSICh0b29sYmFyKSwgR1RLX1RPT0xCQVJfQk9USF9IT1JJWik7CiAKICAg ICBHdGtUb29sSXRlbSogaXRlbTsKCg== 32050 2009-06-30 04:41:20 -0700 2009-06-30 04:51:24 -0700 Use new api for gtk+2 >= 2.15.0, old otherwise gtk-toolbar-orientation2.patch text/plain 595 camaradetux ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYyBiL1dlYktpdFRvb2xz L0d0a0xhdW5jaGVyL21haW4uYwppbmRleCAwNjNiMWNiLi4zZDNhNDhmIDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKKysrIGIvV2ViS2l0VG9vbHMvR3RrTGF1bmNo ZXIvbWFpbi5jCkBAIC0xNDAsNyArMTQwLDExIEBAIGNyZWF0ZV90b29sYmFyICgpCiB7CiAgICAg R3RrV2lkZ2V0KiB0b29sYmFyID0gZ3RrX3Rvb2xiYXJfbmV3ICgpOwogCisjaWYgR1RLX0NIRUNL X1ZFUlNJT04oMiwxNSwwKQogICAgIGd0a19vcmllbnRhYmxlX3NldF9vcmllbnRhdGlvbiAoR1RL X09SSUVOVEFCTEUgKHRvb2xiYXIpLCBHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRBTCk7CisjZWxz ZQorICAgIGd0a190b29sYmFyX3NldF9vcmllbnRhdGlvbihHVEtfVE9PTEJBUih0b29sYmFyKSwg R1RLX09SSUVOVEFUSU9OX0hPUklaT05UQUwpOworI2VuZGlmCiAgICAgZ3RrX3Rvb2xiYXJfc2V0 X3N0eWxlIChHVEtfVE9PTEJBUiAodG9vbGJhciksIEdUS19UT09MQkFSX0JPVEhfSE9SSVopOwog CiAgICAgR3RrVG9vbEl0ZW0qIGl0ZW07Cg==