From 7c61e2bdc0f3eaf13f07d90812d753e2194da628 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
Date: Sun, 12 Jun 2011 17:54:29 +0200
Subject: [PATCH 1/2] Remove custom code for PrintContext.CairoContext

As Cairo.Context is now marked as an ownable, the accessor generated
for PrintContext.CairoContext will be equivalent to what was in the
custom code.
---
 gtk/Gtk.metadata        |  1 -
 gtk/Makefile.am         |  1 -
 gtk/PrintContext.custom | 35 -----------------------------------
 3 files changed, 37 deletions(-)
 delete mode 100644 gtk/PrintContext.custom

diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 056aaac6c..0f12e17f7 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -470,7 +470,6 @@
   <attr path="/api/namespace/object[@cname='GtkPlug']/constructor[@cname='gtk_plug_new_for_display']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkPlug']/property[@name='Embedded']" name="name">IsEmbedded</attr>
   <attr path="/api/namespace/object[@cname='GtkPlug']/method[@name='GetEmbedded']" name="name">GetIsEmbedded</attr>
-  <attr path="/api/namespace/object[@cname='GtkPrintContext']/method[@name='GetCairoContext']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkPrinter']/method[@name='AcceptsPdf']" name="name">GetAcceptsPdf</attr>
   <attr path="/api/namespace/object[@cname='GtkPrinter']/method[@name='AcceptsPs']" name="name">GetAcceptsPs</attr>
   <attr path="/api/namespace/object[@cname='GtkPrinter']/method[@name='HasDetails']" name="name">GetHasDetails</attr>
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b9b0e5429..d1ab23aa1 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -80,7 +80,6 @@ customs = 				\
 	Notebook.custom			\
 	PaperSize.custom		\
 	Plug.custom			\
-	PrintContext.custom		\
 	Printer.custom			\
 	RadioButton.custom		\
 	RadioMenuItem.custom		\
diff --git a/gtk/PrintContext.custom b/gtk/PrintContext.custom
deleted file mode 100644
index 173e1c5f4..000000000
--- a/gtk/PrintContext.custom
+++ /dev/null
@@ -1,35 +0,0 @@
-// PrintContext.custom - customizations to Gtk.PrintContext
-//
-// Authors: Mike Kestner  <mkestner@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-		static extern IntPtr gtk_print_context_get_cairo_context(IntPtr raw);
-
-		[DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
-		static extern void cairo_reference (IntPtr raw);
-
-		public Cairo.Context CairoContext { 
-			get {
-				IntPtr raw_ret = gtk_print_context_get_cairo_context (Handle);
-				cairo_reference (raw_ret);
-				return new Cairo.Context (raw_ret);
-			}
-		}
-

From 21bfaa7a9d84218e01529a7b9af28085f6e68306 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
Date: Sun, 12 Jun 2011 20:12:08 +0200
Subject: [PATCH 2/2] gtk: Mark the Cairo.Context in Widget.Drawn as owned

We shouldn't increase the reference count on the native cairo context
when we get it as a signal parameter, so we mark it as owned.
---
 gtk/Gtk.metadata | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 0f12e17f7..17d74d1f9 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -836,6 +836,7 @@
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Destroy']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Draw']" name="name">Drawn</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@cname='draw']" name="manual">true</attr>
+  <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@cname='draw']/*/*[@name='cr']" name="owned">true</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Event']" name="name">WidgetEvent</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='EventAfter']/*/*[@name='p0']" name="name">event</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='EventAfter']" name="name">WidgetEventAfter</attr>