[Monodevelop-patches-list] r1734 - in trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor: . Gui Search/DocumentIterator

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-06-10 18:23:41 -0400 (Thu, 10 Jun 2004)
New Revision: 1734

Added:
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config
Modified:
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs
Log:
cleanup dllimport


Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-06-10 11:42:55 UTC (rev 1733)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-06-10 22:23:41 UTC (rev 1734)
@@ -1,3 +1,12 @@
+2004-06-10  Todd Berman  <tberman at sevenl.net>
+
+	* Gui/SourceEditorBuffer.cs: use the win32 dll name that gtk-sharp
+	uses for coherence.
+	* Makefile.am: properly install .dll.config
+	* MonoDevelop.SourceEditor.dll.config: new mapping file
+	* Search/DocumentIterator/WholeProjectDocumentIterator.cs: remove
+	warning
+
 2004-06-10  John BouAntoun  <jba-mono at optusnet.com.au>
 	* Gui/Dialogs/GotoLineNumberDialog.cs: made dialog close on pressing
 	escape key.

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-06-10 11:42:55 UTC (rev 1733)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-06-10 22:23:41 UTC (rev 1734)
@@ -208,7 +208,7 @@
 		}
 
 		// needed to make sure the text is valid
-		[DllImport("glib-2.0")]
+		[DllImport("libglib-2.0-0.dll")]
 		static extern bool g_utf8_validate(string text, int textLength, IntPtr end);
 		
 		public void LoadText (string text, string mime)

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-06-10 11:42:55 UTC (rev 1733)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-06-10 22:23:41 UTC (rev 1734)
@@ -85,11 +85,11 @@
 	mcs $(build_sources) /debug /out:$(DLL) /t:library $(REFS) \
 	/resource:$(srcdir)/../../../../data/resources/glade/EditorBindings.glade,EditorBindings.glade \
 	/resource:$(srcdir)/../../../../data/resources/glade/texteditoraddin.glade,texteditoraddin.glade \
-	&& cp $(DLL) ../../../../build/bin/.
+	&& cp $(DLL) ../../../../build/bin/. && cp $(DLL).config ../../../../build/bin/.
 
 assemblydir = $(libdir)/monodevelop/bin
-assembly_DATA = $(DLL)
+assembly_DATA = $(DLL) $(DLL).config
 
 CLEANFILES = $(DLL)
 
-EXTRA_DIST = $(FILES)
+EXTRA_DIST = $(FILES) $(DLL).config

Added: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config	2004-06-10 11:42:55 UTC (rev 1733)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config	2004-06-10 22:23:41 UTC (rev 1734)
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
+</configuration>

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs	2004-06-10 11:42:55 UTC (rev 1733)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs	2004-06-10 22:23:41 UTC (rev 1734)
@@ -35,7 +35,7 @@
 					return null;
 				}
 				
-				return files[curIndex].ToString();;
+				return files[curIndex].ToString();
 			}
 		}