diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-26 01:20:05 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-26 01:20:05 +0800 |
| commit | 6bff02c1dab138ad9fe55860588f98f07f97b58f (patch) | |
| tree | 22da0c7255a6db0e2979adb1e015a0cf2d805689 | |
| parent | b56fb2a10a1020e4a11b3bc5c763ab3bd80b4c55 (diff) | |
| download | marcuscom-ports-6bff02c1dab138ad9fe55860588f98f07f97b58f.tar marcuscom-ports-6bff02c1dab138ad9fe55860588f98f07f97b58f.tar.gz marcuscom-ports-6bff02c1dab138ad9fe55860588f98f07f97b58f.tar.bz2 marcuscom-ports-6bff02c1dab138ad9fe55860588f98f07f97b58f.tar.lz marcuscom-ports-6bff02c1dab138ad9fe55860588f98f07f97b58f.tar.xz marcuscom-ports-6bff02c1dab138ad9fe55860588f98f07f97b58f.tar.zst marcuscom-ports-6bff02c1dab138ad9fe55860588f98f07f97b58f.zip | |
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
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c | 13 |
1 files 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 = { |