[PATCH] nautilus-mono update

[Jürg Billeter <j bitron ch>]

Hi

As nautilus-mono doesn't work with mono / Gtk# Beta 2 anymore, I've
created a patch to make it work again.

Jürg

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus-mono/ChangeLog,v
retrieving revision 1.6
diff -u -r1.6 ChangeLog
--- ChangeLog	28 May 2004 12:41:23 -0000	1.6
+++ ChangeLog	13 Jun 2004 16:00:37 -0000
@@ -1,3 +1,10 @@
+2004-06-13  Jürg Billeter  <j bitron ch>
+
+	* src/Makefile.am:
+	* src/nautilus/File.cs:
+	* src/nautilus/Makefile.am: Update to reflect changes in mono
+	and Gtk# Beta 2.
+
 2004-05-28  Dave Camp  <dave ximian com>
 
 	* src/nautilus/Makefile.am:
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus-mono/src/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- src/Makefile.am	9 Mar 2004 22:54:34 -0000	1.2
+++ src/Makefile.am	13 Jun 2004 16:00:37 -0000
@@ -28,7 +28,7 @@
 	nautilus-mono-object.h
 
 test-extension.dll: test.cs
-	mcs -target:library -out:test-extension.dll -r:nautilus/nautilus-sharp.dll -r:gtk-sharp -r:glib-sharp test.cs
+	mcs -target:library -out:test-extension.dll -r:nautilus/nautilus-sharp.dll -pkg:gtk-sharp test.cs
 
 install-test-extension: test-extension.dll
 	$(mkinstalldirs) $(DESTDIR)$(libdir)/nautilus/extensions-1.0/mono
@@ -37,4 +37,4 @@
 libnautilus_mono_la_LDFLAGS = -module -avoid-version
 libnautilus_mono_la_LIBADD  = $(NAUTILUS_LIBS)
 
-EXTRA_DIST=test.cs
\ No newline at end of file
+EXTRA_DIST=test.cs
Index: src/nautilus/File.cs
===================================================================
RCS file: /cvs/gnome/nautilus-mono/src/nautilus/File.cs,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 File.cs
--- src/nautilus/File.cs	4 Mar 2004 20:28:43 -0000	1.1.1.1
+++ src/nautilus/File.cs	13 Jun 2004 16:00:37 -0000
@@ -34,7 +34,7 @@
 		public string MimeType {
 			get {
 				IntPtr raw_ret = nautilus_file_info_get_mime_type (Handle);
-				string ret = GLibSharp.Marshaller.PtrToStringGFree (raw_ret);
+				string ret = GLib.Marshaller.PtrToStringGFree (raw_ret);
 				return ret;
 			}
 		}
@@ -44,7 +44,7 @@
 		public string UriScheme {
 			get {
 				IntPtr raw_ret = nautilus_file_info_get_uri_scheme (Handle);
-				string ret = GLibSharp.Marshaller.PtrToStringGFree (raw_ret);
+				string ret = GLib.Marshaller.PtrToStringGFree (raw_ret);
 				return ret;
 			}
 		}
@@ -54,7 +54,7 @@
 		public string Uri {
 			get {
 				IntPtr raw_ret = nautilus_file_info_get_uri (Handle);
-				string ret = GLibSharp.Marshaller.PtrToStringGFree (raw_ret);
+				string ret = GLib.Marshaller.PtrToStringGFree (raw_ret);
 				return ret;
 			}
 		}
@@ -64,7 +64,7 @@
 		public string Name {
 			get {
 				IntPtr raw_ret = nautilus_file_info_get_name (Handle);
-				string ret = GLibSharp.Marshaller.PtrToStringGFree (raw_ret);
+				string ret = GLib.Marshaller.PtrToStringGFree (raw_ret);
 				return ret;
 			}
 		}
@@ -74,7 +74,7 @@
 		public string ParentUri {
 			get {
 				IntPtr raw_ret = nautilus_file_info_get_parent_uri (Handle);
-				string ret = GLibSharp.Marshaller.PtrToStringGFree (raw_ret);
+				string ret = GLib.Marshaller.PtrToStringGFree (raw_ret);
 				return ret;
 			}
 		}
@@ -83,7 +83,7 @@
 		static extern IntPtr nautilus_file_info_get_string_attribute (IntPtr raw, string attribute_name);
 		public string GetStringAttribute (string attribute_name) {
 			IntPtr raw_ret = nautilus_file_info_get_string_attribute (Handle, attribute_name);
-			string ret = GLibSharp.Marshaller.PtrToStringGFree (raw_ret);
+			string ret = GLib.Marshaller.PtrToStringGFree (raw_ret);
 			return ret;
 		}
 
Index: src/nautilus/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus-mono/src/nautilus/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- src/nautilus/Makefile.am	28 May 2004 12:41:23 -0000	1.2
+++ src/nautilus/Makefile.am	13 Jun 2004 16:00:37 -0000
@@ -19,7 +19,7 @@
 	touch generated-stamp
 
 $(ASSEMBLY): generated-stamp $(SOURCES)
-	$(MCS) --unsafe --target library -r:gtk-sharp -r:glib-sharp -o $(ASSEMBLY) --recurse '*.cs'
+	$(MCS) --unsafe --target library -pkg:gtk-sharp -o $(ASSEMBLY) --recurse '*.cs'
 
 clean:
 	rm -f generated-stamp