Bug 51885

Summary: [GTK] Fix gtk2 compilation for master
Product: WebKit Reporter: Alejandro G. Castro <alex>
Component: WebKitGTKAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: mrobinson, xan.lopez
Priority: P3 Keywords: Gtk
Version: 528+ (Nightly build)   
Hardware: PC   
OS: Linux   
Attachments:
Description Flags
Proposed patch
none
Proposed patch xan.lopez: review+

Alejandro G. Castro
Reported 2011-01-04 10:57:21 PST
Some functions have been deprecated and we need some cleaning, namely: - gdk_drawable_get_size - gtk_dialog_set_has_separator
Attachments
Proposed patch (5.36 KB, patch)
2011-01-04 11:23 PST, Alejandro G. Castro
no flags
Proposed patch (5.43 KB, patch)
2011-01-05 10:23 PST, Alejandro G. Castro
xan.lopez: review+
Alejandro G. Castro
Comment 1 2011-01-04 11:23:09 PST
Created attachment 77912 [details] Proposed patch
Xan Lopez
Comment 2 2011-01-04 11:41:45 PST
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
Comment 3 2011-01-05 04:37:38 PST
(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
Comment 4 2011-01-05 10:22:43 PST
(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
Comment 5 2011-01-05 10:23:40 PST
Created attachment 78014 [details] Proposed patch
Xan Lopez
Comment 6 2011-01-10 10:36:06 PST
Comment on attachment 78014 [details] Proposed patch Looks good.
Alejandro G. Castro
Comment 7 2011-01-10 11:31:15 PST
Note You need to log in before you can comment on or make changes to this bug.