Index: src/AddAlbumWindow.cs
===================================================================
RCS file: /cvs/gnome/muine/src/AddAlbumWindow.cs,v
retrieving revision 1.36
diff -u -u -r1.36 AddAlbumWindow.cs
--- src/AddAlbumWindow.cs	6 May 2004 10:02:12 -0000	1.36
+++ src/AddAlbumWindow.cs	25 May 2004 20:22:31 -0000
@@ -184,7 +184,7 @@
 	{
 		ResponseArgs args = (ResponseArgs) a;
 
-		switch (args.ResponseId) {
+		switch ((int) args.ResponseId) {
 		case 1: /* Play */
 			window.Visible = false;
 
@@ -351,7 +351,7 @@
 	{
 		TreePath path;
 
-		if (!view.GetPathAtPos (args.X, args.Y, out path, null))
+		if (!view.GetPathAtPos (args.X, args.Y, out path))
 			return;
 
 		IntPtr album_ptr = view.GetHandleFromPath (path);
@@ -364,7 +364,7 @@
 	{
 		TreePath path;
 
-		if (!view.GetPathAtPos (args.X, args.Y, out path, null))
+		if (!view.GetPathAtPos (args.X, args.Y, out path))
 			return;
 
 		if (Muine.CoverDB.Loading)
Index: src/AddSongWindow.cs
===================================================================
RCS file: /cvs/gnome/muine/src/AddSongWindow.cs,v
retrieving revision 1.32
diff -u -u -r1.32 AddSongWindow.cs
--- src/AddSongWindow.cs	27 Apr 2004 17:42:30 -0000	1.32
+++ src/AddSongWindow.cs	25 May 2004 20:22:31 -0000
@@ -145,7 +145,7 @@
 	{
 		ResponseArgs args = (ResponseArgs) a;
 
-		switch (args.ResponseId) {
+		switch ((int) args.ResponseId) {
 		case 1: /* Play */
 			window.Visible = false;
 			
Index: src/Player.cs
===================================================================
RCS file: /cvs/gnome/muine/src/Player.cs,v
retrieving revision 1.15
diff -u -u -r1.15 Player.cs
--- src/Player.cs	11 May 2004 17:52:42 -0000	1.15
+++ src/Player.cs	25 May 2004 20:22:32 -0000
@@ -50,7 +50,7 @@
 
 			player_set_file (Raw, song.Filename, out error_ptr);
 			if (error_ptr != IntPtr.Zero) {
-				string error = Marshaller.PtrToStringGFree (error_ptr);
+				string error = GLib.Marshaller.PtrToStringGFree (error_ptr);
 
 				new ErrorDialog (String.Format (Muine.Catalog.GetString ("Error opening {0}:\n{1}"),
 				                                                         song.Filename, error));
@@ -190,7 +190,7 @@
 		
 		Raw = player_new (out error_ptr);
 		if (error_ptr != IntPtr.Zero) {
-			string error = Marshaller.PtrToStringGFree (error_ptr);
+			string error = GLib.Marshaller.PtrToStringGFree (error_ptr);
 
 			throw new Exception (error);
 		}
Index: src/Song.cs
===================================================================
RCS file: /cvs/gnome/muine/src/Song.cs,v
retrieving revision 1.40
diff -u -u -r1.40 Song.cs
--- src/Song.cs	27 Apr 2004 17:25:41 -0000	1.40
+++ src/Song.cs	25 May 2004 20:22:33 -0000
@@ -424,7 +424,7 @@
 		IntPtr ret, str_ptr;
 
 		ret = db_unpack_string (p, out str_ptr);
-		str = Marshaller.PtrToStringGFree (str_ptr);
+		str = GLib.Marshaller.PtrToStringGFree (str_ptr);
 
 		return ret;
 	}
Index: src/StockIcons.cs
===================================================================
RCS file: /cvs/gnome/muine/src/StockIcons.cs,v
retrieving revision 1.7
diff -u -u -r1.7 StockIcons.cs
--- src/StockIcons.cs	11 Apr 2004 15:42:51 -0000	1.7
+++ src/StockIcons.cs	25 May 2004 20:22:33 -0000
@@ -57,7 +57,7 @@
 			IconSet iconset = new IconSet (pixbuf);
 
 			/* add menu variant if we have it */
-			IO.Stream menu_stream = System.Reflection.Assembly.GetCallingAssembly ().GetManifestResourceStream (name + "-16.png");
+			System.IO.Stream menu_stream = System.Reflection.Assembly.GetCallingAssembly ().GetManifestResourceStream (name + "-16.png");
 			if (menu_stream != null) {
 				IconSource source = new IconSource ();
 				source.Pixbuf = new Pixbuf (menu_stream);
Index: src/StringUtils.cs
===================================================================
RCS file: /cvs/gnome/muine/src/StringUtils.cs,v
retrieving revision 1.12
diff -u -u -r1.12 StringUtils.cs
--- src/StringUtils.cs	26 Feb 2004 10:46:10 -0000	1.12
+++ src/StringUtils.cs	25 May 2004 20:22:33 -0000
@@ -93,7 +93,7 @@
 	{
 		IntPtr str_ptr = g_utf8_collate_key (key, -1);
 		
-		return Marshaller.PtrToStringGFree (str_ptr);
+		return GLib.Marshaller.PtrToStringGFree (str_ptr);
 	}
 
 	public static string SelectionDataToString (Gtk.SelectionData data)