[Muine] patch to remove CellRendererText.cs and ColoredCellRenderer.cs

[Yi Qiang <yqiang washington edu>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,
I looked through the TODO list and it looks like we can those two files.
 Patch works fine here but I'm not certain how far back you can go
without things breaking (gtk 2.6?).  Here are the relevant versions on
my system:

gtk-sharp-2 2.8.0-1
gtk2 2.8.11


- --Yi
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFD5tD/tXlIMrUVVksRAmFmAJ9U5zP8jYhjEKtSjj53A+Qbk/KOKACfVKbh
0uKc+9RYUm47KUfaPPZnyJg=
=WUFW
-----END PGP SIGNATURE-----

diff -ruN muine-0.8.4.fresh/src/AddWindow.cs muine-0.8.4/src/AddWindow.cs
--- muine-0.8.4.fresh/src/AddWindow.cs	2006-01-24 22:02:58.000000000 -0800
+++ muine-0.8.4/src/AddWindow.cs	2006-02-05 20:10:13.000000000 -0800
@@ -53,7 +53,7 @@
 		
 		private AddWindowEntry entry         = new AddWindowEntry         ();
 		private AddWindowList  list          = new AddWindowList          ();
-		private CellRenderer   text_renderer = new Muine.CellRendererText ();
+		private CellRenderer   text_renderer = new CellRendererText ();
 
 		// Constants
 		private const uint search_timeout = 100;
diff -ruN muine-0.8.4.fresh/src/CellRendererText.cs muine-0.8.4/src/CellRendererText.cs
--- muine-0.8.4.fresh/src/CellRendererText.cs	2006-01-24 22:02:58.000000000 -0800
+++ muine-0.8.4/src/CellRendererText.cs	1969-12-31 16:00:00.000000000 -0800
@@ -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));
-                }
-        }
-}
diff -ruN muine-0.8.4.fresh/src/ColoredCellRendererPixbuf.cs muine-0.8.4/src/ColoredCellRendererPixbuf.cs
--- muine-0.8.4.fresh/src/ColoredCellRendererPixbuf.cs	2006-01-24 22:02:58.000000000 -0800
+++ muine-0.8.4/src/ColoredCellRendererPixbuf.cs	1969-12-31 16:00:00.000000000 -0800
@@ -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)); }
-		}
-	}
-}
diff -ruN muine-0.8.4.fresh/src/Makefile.in muine-0.8.4/src/Makefile.in
--- muine-0.8.4.fresh/src/Makefile.in	2006-01-29 20:51:10.000000000 -0800
+++ muine-0.8.4/src/Makefile.in	2006-02-05 20:10:46.000000000 -0800
@@ -254,8 +254,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		\
diff -ruN muine-0.8.4.fresh/src/PlaylistWindow.cs muine-0.8.4/src/PlaylistWindow.cs
--- muine-0.8.4.fresh/src/PlaylistWindow.cs	2006-01-29 17:27:18.000000000 -0800
+++ muine-0.8.4/src/PlaylistWindow.cs	2006-02-05 20:10:33.000000000 -0800
@@ -866,8 +866,8 @@
 
 			playlist.Selection.Mode = SelectionMode.Multiple;
 
-			pixbuf_renderer = new ColoredCellRendererPixbuf ();
-			text_renderer   = new Muine.CellRendererText ();
+			pixbuf_renderer = new CellRendererPixbuf ();
+			text_renderer   = new CellRendererText ();
 			
 			TreeViewColumn col = new TreeViewColumn ();
 			col.Sizing = TreeViewColumnSizing.Fixed;
@@ -2107,7 +2107,7 @@
 		private void PixbufCellDataFunc (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) {