Index: configure.in
===================================================================
RCS file: /cvs/gnome/muine/configure.in,v
retrieving revision 1.156
diff -u -B -r1.156 configure.in
--- configure.in	14 Dec 2006 09:47:59 -0000	1.156
+++ configure.in	18 Dec 2006 14:05:21 -0000
@@ -23,10 +23,10 @@
 LIBXINE_REQUIRED=1.0.0
 GSTREAMER_REQUIRED=0.10.0
 GSTREAMER_OLD_REQUIRED=0.8.0
-GTK_REQUIRED=2.6
+GTK_REQUIRED=2.8
 ICON_THEME_REQUIRED=2.10
 MONO_REQUIRED=1.1
-GTKSHARP_REQUIRED=2.4.0
+GTKSHARP_REQUIRED=2.8.0
 DBUSSHARP_REQUIRED=0.21
 MONODOC_REQUIRED=1.1.9
 
Index: src/AddAlbumWindow.cs
===================================================================
RCS file: /cvs/gnome/muine/src/AddAlbumWindow.cs,v
retrieving revision 1.83
diff -u -B -r1.83 AddAlbumWindow.cs
--- src/AddAlbumWindow.cs	10 Sep 2006 06:21:09 -0000	1.83
+++ src/AddAlbumWindow.cs	18 Dec 2006 14:05:21 -0000
@@ -250,7 +250,7 @@
 		}
 
 		// Methods :: Private :: SetText
-		private void SetText (Muine.CellRendererText cell, Gtk.TreeIter iter)
+		private void SetText (Gtk.CellRendererText cell, Gtk.TreeIter iter)
 		{			
 			// Album
 			Album album = GetAlbum (iter);
@@ -365,7 +365,7 @@
 		  (Gtk.TreeViewColumn col, Gtk.CellRenderer cell, Gtk.TreeModel model,
 		   Gtk.TreeIter iter)
 		{
-			Muine.CellRendererText cell_txt = (Muine.CellRendererText) cell;
+			Gtk.CellRendererText cell_txt = (Gtk.CellRendererText) cell;
 			SetText (cell_txt, iter);
 		}		
 	}
Index: src/AddSongWindow.cs
===================================================================
RCS file: /cvs/gnome/muine/src/AddSongWindow.cs,v
retrieving revision 1.76
diff -u -B -r1.76 AddSongWindow.cs
--- src/AddSongWindow.cs	10 Sep 2006 06:21:09 -0000	1.76
+++ src/AddSongWindow.cs	18 Dec 2006 14:05:21 -0000
@@ -121,7 +121,7 @@
 		}
 
 		// Methods :: Private :: SetText
-		private void SetText (Muine.CellRendererText cell, Gtk.TreeIter iter)
+		private void SetText (Gtk.CellRendererText cell, Gtk.TreeIter iter)
 		{			
 			// Song
 			Song song = GetSong (iter);
@@ -230,7 +230,7 @@
 		  (Gtk.TreeViewColumn col, Gtk.CellRenderer cell, Gtk.TreeModel model,
 		   Gtk.TreeIter iter)
 		{
-			Muine.CellRendererText cell_txt = (Muine.CellRendererText) cell;
+			Gtk.CellRendererText cell_txt = (Gtk.CellRendererText) cell;
 			SetText (cell_txt, iter);
 		}		
 	}
Index: src/AddWindow.cs
===================================================================
RCS file: /cvs/gnome/muine/src/AddWindow.cs,v
retrieving revision 1.31
diff -u -B -r1.31 AddWindow.cs
--- src/AddWindow.cs	10 Sep 2006 06:13:30 -0000	1.31
+++ src/AddWindow.cs	18 Dec 2006 14:05:22 -0000
@@ -69,7 +69,7 @@
 		private AddWindowList  list  = new AddWindowList  ();
 
 		private Gtk.CellRenderer text_renderer =
-		  new Muine.CellRendererText ();
+		  new Gtk.CellRendererText ();
 #endregion Widgets
 
 
Index: src/CellRendererText.cs
===================================================================
RCS file: src/CellRendererText.cs
diff -N src/CellRendererText.cs
--- src/CellRendererText.cs	8 Sep 2006 00:18:29 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005 Jorn Baayen <jbaayen@gnome.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU 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.
- */
-
-// FIXME: ditch this whole thing once Gtk# gets 2.6 support
-
-namespace Muine
-{
-	public class CellRendererText : Gtk.CellRendererText
-	{
-		// Constructor
-		/// <summary>
-		///	Create a new <see cref="CellRendererText" /> object.
-		/// </summary>
-		/// <remarks>
-		///	The text is ellipsized with 3 ellipses (as per English).
-		/// </remarks>
-		public CellRendererText ()
-		{
-			SetProperty ("ellipsize", new GLib.Value (3));
-		}
-	}
-}
Index: src/ColoredCellRendererPixbuf.cs
===================================================================
RCS file: src/ColoredCellRendererPixbuf.cs
diff -N src/ColoredCellRendererPixbuf.cs
--- src/ColoredCellRendererPixbuf.cs	15 Mar 2005 11:25:46 -0000	1.8
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2004 Jorn Baayen <jbaayen@gnome.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU 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.
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace Muine
-{
-	/// <summary>
-	/// </summary>
-	/// <remarks>
-	///	This renderer is similar to <see cref="Gtk.CellRendererPixbuf" />.
-	/// </remarks>
-	public class ColoredCellRendererPixbuf : Gtk.CellRenderer 
-	{
-		// Constructor
-		[DllImport ("libmuine")]
-		private static extern IntPtr rb_cell_renderer_pixbuf_new ();
-
-		/// <summary>
-		///	Create a new <see cref="ColoredCellRendererPixbuf" />
-		///	object.
-		/// </summary>
-		public ColoredCellRendererPixbuf () : base (IntPtr.Zero)
-		{
-			base.Raw = rb_cell_renderer_pixbuf_new ();
-		}
-
-		// Destructor
-		~ColoredCellRendererPixbuf ()
-		{
-			Dispose ();
-		}
-
-		// Properties
-		// Properties :: Pixbuf (set;)
-		/// <summary>
-		///	The <see cref="Gdk.Pixbuf" /> to be used.
-		/// </summary>
-		/// <param name="value">
-		///	A <see cref="Gdk.Pixbuf" />.
-		/// </param>
-		public Gdk.Pixbuf Pixbuf {
-			set { SetProperty ("pixbuf", new GLib.Value (value)); }
-		}
-	}
-}
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/muine/src/Makefile.am,v
retrieving revision 1.79
diff -u -B -r1.79 Makefile.am
--- src/Makefile.am	5 Nov 2006 00:31:10 -0000	1.79
+++ src/Makefile.am	18 Dec 2006 14:05:22 -0000
@@ -25,8 +25,6 @@
 	$(srcdir)/HandleView.cs			\
 	$(srcdir)/HandleModel.cs		\
 	$(srcdir)/StockIcons.cs			\
-	$(srcdir)/CellRendererText.cs	        \
-	$(srcdir)/ColoredCellRendererPixbuf.cs	\
 	$(srcdir)/CoverDatabase.cs		\
 	$(srcdir)/CoverGetter.cs		\
 	$(srcdir)/MusicBrainz.cs		\
Index: src/PlaylistWindow.cs
===================================================================
RCS file: /cvs/gnome/muine/src/PlaylistWindow.cs,v
retrieving revision 1.248
diff -u -B -r1.248 PlaylistWindow.cs
--- src/PlaylistWindow.cs	9 Sep 2006 00:35:36 -0000	1.248
+++ src/PlaylistWindow.cs	18 Dec 2006 14:05:27 -0000
@@ -890,8 +890,8 @@
 
 			playlist.Selection.Mode = SelectionMode.Multiple;
 
-			pixbuf_renderer = new ColoredCellRendererPixbuf ();
-			text_renderer   = new Muine.CellRendererText ();
+			pixbuf_renderer = new CellRendererPixbuf ();
+			text_renderer   = new CellRendererText ();
 
 			// Column			
 			TreeViewColumn col = new TreeViewColumn ();
@@ -2230,7 +2230,7 @@
 		  (TreeViewColumn col, CellRenderer cell, TreeModel model,
 		   TreeIter iter)
 		{
-			ColoredCellRendererPixbuf r = (ColoredCellRendererPixbuf) cell;
+			CellRendererPixbuf r = (CellRendererPixbuf) cell;
 			IntPtr handle = playlist.Model.HandleFromIter (iter);
 
 			if (handle == playlist.Model.Playing) {
