[MonoDevelop] Patch: compile with latest gtk#

[Fredrik Nilsson]

--=-3Q2OZFtudIdJ2s076Ton
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

New patch with changelog.

On lör, 2005-04-23 at 14:18 +0200, Ben Motmans wrote:
> please include a changelog in your patch
> 
> On 4/23/05, Fredrik Nilsson <jymdman@home.se> wrote:
> > Hi,
> > 
> > Small patch to compile with latest gtk# from svn.
> > Internal IconView conflicts with the one from gtk#
> > 
> > /Fredrik
> > 
> > 
> >
> _______________________________________________
> Monodevelop-list mailing list
> Monodevelop-list@lists.ximian.com
> http://lists.ximian.com/mailman/listinfo/monodevelop-list
> 

--=-3Q2OZFtudIdJ2s076Ton
Content-Disposition: attachment; filename=iconview.diff
Content-Type: text/x-patch; name=iconview.diff; charset=utf-8
Content-Transfer-Encoding: 7bit

Index: Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs	(revision 2468)
+++ Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs	(arbetskopia)
@@ -31,7 +31,7 @@
 		ArrayList alltemplates = new ArrayList();
 		ArrayList categories   = new ArrayList();
 		
-		IconView TemplateView;
+		MonoDevelop.Gui.Widgets.IconView TemplateView;
 		FolderEntry entry_location;
 		TreeStore catStore;
 		
@@ -294,8 +294,6 @@
 			
 			lst_template_types.Selection.Changed += new EventHandler (CategoryChange);
 			
-			TemplateView = new IconView();
-
 			TreeViewColumn catColumn = new TreeViewColumn ();
 			catColumn.Title = "categories";
 			
@@ -305,7 +303,7 @@
 
 			lst_template_types.AppendColumn (catColumn);
 
-			TemplateView = new IconView ();
+			TemplateView = new MonoDevelop.Gui.Widgets.IconView ();
 			hbox_template.PackStart (TemplateView, true, true, 0);
 
 			entry_location = new FolderEntry (GettextCatalog.GetString ("Combine Location"));
Index: Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs	(revision 2468)
+++ Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs	(arbetskopia)
@@ -37,7 +37,7 @@
 		TreeStore templateStore;
 		Gtk.TreeView catView;
 		Gtk.TreeView templateView;
-		IconView TemplateView;
+		MonoDevelop.Gui.Widgets.IconView TemplateView;
 		Button okButton;
 		Button cancelButton;
 		Label infoLabel;
@@ -296,7 +296,7 @@
 			catView.WidthRequest = 160;
 			catView.HeadersVisible = false;
 			templateView = new Gtk.TreeView (templateStore);
-			TemplateView = new IconView();
+			TemplateView = new MonoDevelop.Gui.Widgets.IconView();
 
 			TreeViewColumn catColumn = new TreeViewColumn ();
 			catColumn.Title = "categories";
Index: Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- Core/src/MonoDevelop.Base/ChangeLog	(revision 2468)
+++ Core/src/MonoDevelop.Base/ChangeLog	(arbetskopia)
@@ -1,3 +1,9 @@
+2005-04-23	Fredrik Nilsson	<jymdman@home.se>
+
+	* Gui/Dialogs/NewFileDialog.cs:
+	* Gui/Dialogs/NewProjectDialogs.cs: Fix to compile
+	with gtk-sharp from svn.
+	
 2005-04-17	John Luke	<john.luke@gmail.com>
 
 	* Makefile.am: fix distcheck

--=-3Q2OZFtudIdJ2s076Ton--