[Monodevelop-patches-list] r1382 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs

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

Author: jluke
Date: 2004-04-04 15:53:41 -0400 (Sun, 04 Apr 2004)
New Revision: 1382

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
Log:
* Gui/Dialogs/SharpDevelopAboutPanels.cs: call Path.GetFullPath
       on assembly location to get rid of '../AddIn/..' stuff
       send the text to the X clipboard also


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-04 19:00:49 UTC (rev 1381)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-04 19:53:41 UTC (rev 1382)
@@ -1,6 +1,9 @@
 2004-04-04  John Luke  <jluke at cfl.rr.com>
 
 	* Gui/Pads/FileScout.cs: use Gtk.Stock.Open for the icon
+	* Gui/Dialogs/SharpDevelopAboutPanels.cs: call Path.GetFullPath
+	on assembly location to get rid of '../AddIn/..' stuff
+	send the text to the X clipboard also
 
 2004-04-04  Todd Berman  <tberman at sevenl.net>
 

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs	2004-04-04 19:00:49 UTC (rev 1381)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs	2004-04-04 19:53:41 UTC (rev 1382)
@@ -6,13 +6,11 @@
 // </file>
 
 using System;
-using System.Drawing;
-using Gtk;
-
 using System.IO;
 using System.Text;
 using System.Reflection;
 
+using Gtk;
 using MonoDevelop.Gui;
 using MonoDevelop.Core.Properties;
 using MonoDevelop.Core.Services;
@@ -202,7 +200,7 @@
 				string loc;
 				
 				try {
-					loc = asm.Location;
+					loc = System.IO.Path.GetFullPath (asm.Location);
 				} catch (Exception) {
 					loc = GettextCatalog.GetString ("dynamic");
 				}
@@ -215,8 +213,6 @@
 		
 		void CopyButtonClick(object o, EventArgs args)
 		{
-			clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
-
 			StringBuilder versionInfo = new StringBuilder();
 			foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies()) {
 				AssemblyName name = asm.GetName();
@@ -225,7 +221,7 @@
 				versionInfo.Append(name.Version.ToString());
 				versionInfo.Append(",");
 				try {
-					versionInfo.Append(asm.Location);
+					versionInfo.Append(System.IO.Path.GetFullPath (asm.Location));
 				} catch (Exception) {
 					versionInfo.Append(GettextCatalog.GetString ("dynamic"));
 				}
@@ -233,7 +229,11 @@
 				versionInfo.Append(Environment.NewLine);
 			}
 			
+			// set to both the X and normal clipboards
+			clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
 			clipboard.SetText (versionInfo.ToString ());
+			clipboard = Clipboard.Get (Gdk.Atom.Intern ("PRIMARY", false));
+			clipboard.SetText (versionInfo.ToString ());
 		}
 	}
 }