From 6bff02c1dab138ad9fe55860588f98f07f97b58f Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 25 Aug 2005 17:20:05 +0000 Subject: Fix build by correctly merging previous patch. Reported by: mux git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4627 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c b/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c index 6e3382f0e..7ba977a67 100644 --- a/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c +++ b/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c @@ -1,5 +1,14 @@ ---- gdk/gdkscreen.c.orig Thu Aug 25 12:09:18 2005 -+++ gdk/gdkscreen.c Thu Aug 25 12:25:31 2005 +--- gdk/gdkscreen.c.orig Tue Aug 23 23:29:05 2005 ++++ gdk/gdkscreen.c Thu Aug 25 13:18:01 2005 +@@ -29,7 +29,7 @@ + #include "gdkalias.h" + + static void gdk_screen_class_init (GdkScreenClass *klass); +-static void gdk_screen_init (GdkScreen *screen); ++static void gdk_screen_init_instance (GTypeInstance *instance, gpointer g_class); + static void gdk_screen_dispose (GObject *object); + static void gdk_screen_finalize (GObject *object); + @@ -53,14 +53,14 @@ gdk_screen_get_type (void) static const GTypeInfo object_info = { -- cgit v1.2.3