Bug 26835 – [GTK] GtkLauncher depends on gtk+2-2.15 because of gtk_orientable_set_orientation()

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Adrien Nader]

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)

[Adrien Nader]

Created attachment 32048 [details]
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).

[Adrien Nader]

Created attachment 32050 [details]
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.

[Jan Alonzo]

Comment on attachment 32050 [details]
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.

[Jan Alonzo]

(In reply to comment #3)
> (From update of attachment 32050 [details] [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.