Bug 26583 – [Gtk] Remove deprecated GTK+ symbols

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Andre Klapper]

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.

[Emilio Pozuelo Monfort]

I'm working on this

[Emilio Pozuelo Monfort]

Created attachment 31880 [details]
Stop using deprecated GTK+ symbols

My first WebKit patch!

[Jan Alonzo]

Comment on attachment 31880 [details]
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 @@
> [phone]  Emilio Pozuelo Monfort  <[e-mail]>
> +
> +        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  <[e-mail]>
>  
>          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?

[Emilio Pozuelo Monfort]

(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 :)

[Jan Alonzo]

Comment on attachment 31880 [details]
Stop using deprecated GTK+ symbols

r=m3

[Jan Alonzo]

(In reply to comment #5)
> (From update of attachment 31880 [details] [review])
> r=m3
> 

Landed in r45319