Modified previous commit to not break ABI

Author: jstedfast

Mono.Debugging.Soft/SoftDebuggerSession.cs

@@ -378,12 +378,18 @@ void ConnectionStarting (IAsyncResult connectionHandle, DebuggerStartInfo dsi, b
 				throw new InvalidOperationException ("Already connecting");
 
 			connection = connectionHandle;
-			
-			if (ConnectionDialogCreator != null && attemptNumber == 0) {
-				connectionDialog = ConnectionDialogCreator (dsi);
-				connectionDialog.UserCancelled += delegate {
-					EndSession ();
-				};
+
+			if (attemptNumber == 0) {
+				if (ConnectionDialogCreatorExtended != null)
+					connectionDialog = ConnectionDialogCreatorExtended (dsi);
+				else if (ConnectionDialogCreator != null)
+					connectionDialog = ConnectionDialogCreator ();
+
+				if (connectionDialog != null) {
+					connectionDialog.UserCancelled += delegate {
+						EndSession ();
+					};
+				}
 			}
 
 			if (connectionDialog != null)

Mono.Debugging/Mono.Debugging.Client/DebuggerSession.cs

@@ -42,7 +42,8 @@ namespace Mono.Debugging.Client
 	public delegate string TypeResolverHandler (string identifier, SourceLocation location);
 	public delegate void BreakpointTraceHandler (BreakEvent be, string trace);
 	public delegate IExpressionEvaluator GetExpressionEvaluatorHandler (string extension);
-	public delegate IConnectionDialog ConnectionDialogCreator (DebuggerStartInfo dsi);
+	public delegate IConnectionDialog ConnectionDialogCreatorExtended (DebuggerStartInfo dsi);
+	public delegate IConnectionDialog ConnectionDialogCreator ();
 
 	public abstract class DebuggerSession: IDisposable
 	{
@@ -169,6 +170,11 @@ public ExceptionHandler ExceptionHandler {
 		/// </summary>
 		public ConnectionDialogCreator ConnectionDialogCreator { get; set; }
 
+		/// <summary>
+		/// Gets or sets the connection dialog creator callback.
+		/// </summary>
+		public ConnectionDialogCreatorExtended ConnectionDialogCreatorExtended { get; set; }
+
 		/// <summary>
 		/// Gets or sets the breakpoint trace handler.
 		/// </summary>