From 6647c2609cf6b118193eed83c7c617cda7357064 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@novell.com>
Date: Thu, 21 Apr 2011 18:01:33 -0500
Subject: [PATCH] Revert a couple files to mono master

* cairo/Cairo.cs: make a static class like master
* cairo/ImageSurface.cs: revert obsolete warning and ws changes
---
 cairo/Cairo.cs        | 5 +----
 cairo/ImageSurface.cs | 8 +++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cairo/Cairo.cs b/cairo/Cairo.cs
index 3eb667a47..c0a5f2ab0 100644
--- a/cairo/Cairo.cs
+++ b/cairo/Cairo.cs
@@ -36,10 +36,7 @@ using System.Runtime.InteropServices;
 
 namespace Cairo
 {
-	public class CairoAPI {
-
-		private CairoAPI () {}
-
+	public static class CairoAPI {
 		static public int Version {
 			get {
 				return Cairo.NativeMethods.cairo_version ();
diff --git a/cairo/ImageSurface.cs b/cairo/ImageSurface.cs
index d8c14a373..659833a7c 100644
--- a/cairo/ImageSurface.cs
+++ b/cairo/ImageSurface.cs
@@ -50,9 +50,11 @@ namespace Cairo {
 				surfaces [surface] = this;
 			}
 		}
-
-		[Obsolete ("Replaced by ctor (byte[] data, Cairo.Format format, int width, int height, int stride)")]
-		public ImageSurface (ref byte[] data, Cairo.Format format, int width, int height, int stride) : this (data, format, width, height, stride) {}
+		
+		[Obsolete ("Use ImageSurface (byte[] data, Cairo.Format format, int width, int height, int stride)")]
+		public ImageSurface (ref byte[] data, Cairo.Format format, int width, int height, int stride) :this (data, format, width, height, stride)
+		{
+		}
 
 		public ImageSurface (byte[] data, Cairo.Format format, int width, int height, int stride)
 		{