Small changes for 1.1.1 and a Best fix.



This patch fixes a compilation issue with 1.1.1 or CVS, and adds the
beagle lib directory to LD_LIBRARY_PATH for best. Apparently the gaim
log renderer was attempting to use inotify somehow, and dying.

Ok to commit?

--Todd
Index: Best/best.in
===================================================================
RCS file: /cvs/gnome/beagle/Best/best.in,v
retrieving revision 1.11
diff -u -r1.11 best.in
--- Best/best.in	5 Oct 2004 19:50:48 -0000	1.11
+++ Best/best.in	17 Oct 2004 19:28:45 -0000
@@ -4,9 +4,11 @@
     echo "*** Running uninstalled @target@ ***"
     THIS_PATH="../Util:../images:../Lucene.Net:../indexer:../Tiles:../BeagleClient"
     THIS_EXE="./@target@"
+    export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH"
 else
     THIS_PATH="@pkglibdir@"
     THIS_EXE="@pkglibdir@/@target@"
+    export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
 fi
 
 MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec -a mono-best mono --debug $THIS_EXE "$@"
Index: Filters/HtmlAgilityPack/tools.cs
===================================================================
RCS file: /cvs/gnome/beagle/Filters/HtmlAgilityPack/tools.cs,v
retrieving revision 1.1
diff -u -r1.1 tools.cs
--- Filters/HtmlAgilityPack/tools.cs	3 May 2004 17:26:08 -0000	1.1
+++ Filters/HtmlAgilityPack/tools.cs	17 Oct 2004 19:28:45 -0000
@@ -55,7 +55,7 @@
 	internal struct HtmlLibrary
 	{
 		[Conditional("DEBUG")]
-		internal static void GetVersion(out string version)
+		internal static void GetVersion(ref string version)
 		{
 			System.Diagnostics.StackFrame sf = new System.Diagnostics.StackFrame(1, true);
 			version = sf.GetMethod().DeclaringType.Assembly.GetName().Version.ToString();
@@ -67,7 +67,7 @@
 		{
 			// category is the method
 			string name = null;
-			GetCurrentMethodName(2, out name);
+			GetCurrentMethodName(2, ref name);
 			System.Diagnostics.Trace.WriteLine(Value, name);
 		}
 
@@ -76,7 +76,7 @@
 		internal static void TraceStackFrame(int steps)
 		{
 			string name = null;
-			GetCurrentMethodName(2, out name);
+			GetCurrentMethodName(2, ref name);
 			string trace = "";
 			for(int i=1;i<steps;i++)
 			{
@@ -88,14 +88,14 @@
 		}
 
 		[Conditional("DEBUG")]
-		internal static void GetCurrentMethodName(out string name)
+		internal static void GetCurrentMethodName(ref string name)
 		{
 			name = null;
-			GetCurrentMethodName(2, out name);
+			GetCurrentMethodName(2, ref name);
 		}
 
 		[Conditional("DEBUG")]
-		internal static void GetCurrentMethodName(int skipframe, out string name)
+		internal static void GetCurrentMethodName(int skipframe, ref string name)
 		{
 			StackFrame sf = new StackFrame(skipframe, true);
 			name = sf.GetMethod().DeclaringType.Name + "." + sf.GetMethod().Name;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]