Author: vince Date: Sat Mar 26 15:56:59 2011 New Revision: 12138 URL: http://source.netsurf-browser.org?rev=12138&view=rev Log: make teh GTK frontend build on -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DPANGO_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGTK_MULTIHEAD_SAFE Modified: trunk/netsurf/gtk/plotters.c trunk/netsurf/gtk/print.c trunk/netsurf/gtk/sexy_icon_entry.h trunk/netsurf/gtk/throbber.c trunk/netsurf/gtk/thumbnail.c trunk/netsurf/gtk/window.c trunk/netsurf/windows/gui.c Modified: trunk/netsurf/gtk/plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/plotters.c?rev=12138&... ============================================================================== --- trunk/netsurf/gtk/plotters.c (original) +++ trunk/netsurf/gtk/plotters.c Sat Mar 26 15:56:59 2011 @@ -69,8 +69,7 @@ colour.blue = b | (b << 8); colour.pixel = (r << 16) | (g << 8) | b; - gdk_color_alloc(gdk_colormap_get_system(), - &colour); + gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, true, true); gdk_gc_set_foreground(current_gc, &colour); cairo_set_source_rgba(current_cr, r / 255.0, @@ -89,8 +88,8 @@ colour.green = 0; colour.blue = 0; colour.pixel = 0; - gdk_color_alloc(gdk_colormap_get_system(), - &colour); + gdk_colormap_alloc_color(gdk_colormap_get_system(), + &colour, true, true); gdk_gc_set_foreground(current_gc, &colour); gdk_draw_line(current_drawable, current_gc, Modified: trunk/netsurf/gtk/print.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/print.c?rev=12138&... ============================================================================== --- trunk/netsurf/gtk/print.c (original) +++ trunk/netsurf/gtk/print.c Sat Mar 26 15:56:59 2011 @@ -66,7 +66,7 @@ colour.blue = b | (b << 8); colour.pixel = (r << 16) | (g << 8) | b; - gdk_color_alloc(gdk_colormap_get_system(), &colour); + gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, true, true); cairo_set_source_rgba(gtk_print_current_cr, r / 255.0, g / 255.0, b / 255.0, 1.0); Modified: trunk/netsurf/gtk/sexy_icon_entry.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/sexy_icon_entry.h?rev... ============================================================================== --- trunk/netsurf/gtk/sexy_icon_entry.h (original) +++ trunk/netsurf/gtk/sexy_icon_entry.h Sat Mar 26 15:56:59 2011 @@ -25,8 +25,7 @@ typedef struct _SexyIconEntryClass SexyIconEntryClass; typedef struct _SexyIconEntryPriv SexyIconEntryPriv; -#include <gtk/gtkentry.h> -#include <gtk/gtkimage.h> +#include <gtk/gtk.h> #define SEXY_TYPE_ICON_ENTRY (sexy_icon_entry_get_type()) #define SEXY_ICON_ENTRY(obj) \ Modified: trunk/netsurf/gtk/throbber.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/throbber.c?rev=12138&... ============================================================================== --- trunk/netsurf/gtk/throbber.c (original) +++ trunk/netsurf/gtk/throbber.c Sat Mar 26 15:56:59 2011 @@ -77,7 +77,7 @@ if (errors_when_loading == true) { for (frame_loop = 0; frame_loop < frames; frame_loop++) { if (throb->framedata[frame_loop] != NULL) - gdk_pixbuf_unref(throb->framedata[frame_loop]); + g_object_unref(throb->framedata[frame_loop]); } free(throb->framedata); @@ -96,7 +96,7 @@ int i; for (i = 0; i < nsgtk_throbber->nframes; i++) - gdk_pixbuf_unref(nsgtk_throbber->framedata[i]); + g_object_unref(nsgtk_throbber->framedata[i]); free(nsgtk_throbber->framedata); free(nsgtk_throbber); Modified: trunk/netsurf/gtk/thumbnail.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/thumbnail.c?rev=12138... ============================================================================== --- trunk/netsurf/gtk/thumbnail.c (original) +++ trunk/netsurf/gtk/thumbnail.c Sat Mar 26 15:56:59 2011 @@ -26,6 +26,8 @@ #include <assert.h> #include <gtk/gtk.h> +#include <gdk/gdk.h> + #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" Modified: trunk/netsurf/gtk/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/window.c?rev=12138&am... ============================================================================== --- trunk/netsurf/gtk/window.c (original) +++ trunk/netsurf/gtk/window.c Sat Mar 26 15:56:59 2011 @@ -954,8 +954,8 @@ 16, 16); r = gdk_cursor_new_from_pixmap(source, mask, &fg, &bg, 0, 3); - gdk_pixmap_unref(source); - gdk_pixmap_unref(mask); + g_object_unref(source); + g_object_unref(mask); return r; } Modified: trunk/netsurf/windows/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/gui.c?rev=12138&a... ============================================================================== --- trunk/netsurf/windows/gui.c (original) +++ trunk/netsurf/windows/gui.c Sat Mar 26 15:56:59 2011 @@ -205,7 +205,6 @@ } } - LOG(("gw %p",gw)); return gw; }