Bug 51885 – [GTK] Fix gtk2 compilation for master

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

[Alejandro G. Castro]

Some functions have been deprecated and we need some cleaning, namely:

   - gdk_drawable_get_size
   - gtk_dialog_set_has_separator

[Alejandro G. Castro]

Created attachment 77912 [details]
Proposed patch

[Xan Lopez]

Comment on attachment 77912 [details]
Proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=77912&action=review

> Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:43
> +    gdk_pixmap_get_size(GDK_DRAWABLE(pixmap), &width, &height);

This is confusing, I think you should make the macro do nothing in newer versions. But then the code will be a mess to understand... ugh :/(the fact that it still compiles tells me the GTK+ guys dropped the ball by now).

> WebKit/gtk/webkit/webkitsoupauthdialog.c:230
> +    g_object_set(dialog, "has-separator", FALSE, NULL);

Let's just remove the separator? It's not like we have to have one or anything :)

[Alejandro G. Castro]

(In reply to comment #2)
> (From update of attachment 77912 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=77912&action=review
> 
> > Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:43
> > +    gdk_pixmap_get_size(GDK_DRAWABLE(pixmap), &width, &height);
> 
> This is confusing, I think you should make the macro do nothing in newer versions. But then the code will be a mess to understand... ugh :/(the fact that it still compiles tells me the GTK+ guys dropped the ball by now).
> 

Yep, I can add that or even try to remove the gtk2 code and use other way to get the size.

> > WebKit/gtk/webkit/webkitsoupauthdialog.c:230
> > +    g_object_set(dialog, "has-separator", FALSE, NULL);
> 
> Let's just remove the separator? It's not like we have to have one or anything :)

Actually we are removing it with the code, but yeah, I do not think anything depends on not having it.

[Alejandro G. Castro]

(In reply to comment #3)
> (In reply to comment #2)
> > (From update of attachment 77912 [details] [details])
> > View in context: https://bugs.webkit.org/attachment.cgi?id=77912&action=review
> > 
> > > Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:43
> > > +    gdk_pixmap_get_size(GDK_DRAWABLE(pixmap), &width, &height);
> > 
> > This is confusing, I think you should make the macro do nothing in newer versions. But then the code will be a mess to understand... ugh :/(the fact that it still compiles tells me the GTK+ guys dropped the ball by now).
> > 
> 
> Yep, I can add that or even try to remove the gtk2 code and use other way to get the size.
> 

I've checked we do not need this, we did not even need GDK_DRAWABLE macro in the first place because:

...
typedef struct _GdkDrawable           GdkDrawable;
...
typedef struct _GdkDrawable           GdkPixmap;
...

[Alejandro G. Castro]

Created attachment 78014 [details]
Proposed patch

[Xan Lopez]

Comment on attachment 78014 [details]
Proposed patch

Looks good.

[Alejandro G. Castro]

Landed http://trac.webkit.org/changeset/75397