X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1f1ec0e5f5c665264f91cc0675ce575d85adbb98..e35fb54b2ce23c668414c0f5cd072c709374fc6d:/mac/macdlg.c

diff --git a/mac/macdlg.c b/mac/macdlg.c
index 93a2a3fa..872d1894 100644
--- a/mac/macdlg.c
+++ b/mac/macdlg.c
@@ -1,4 +1,4 @@
-/* $Id: macdlg.c,v 1.16 2003/03/25 23:18:59 ben Exp $ */
+/* $Id: macdlg.c,v 1.18 2003/04/05 15:01:16 ben Exp $ */
 /*
  * Copyright (c) 2002 Ben Harris
  * All rights reserved.
@@ -47,6 +47,7 @@
 #include "storage.h"
 
 static void mac_closedlg(WindowPtr);
+static void mac_enddlg(WindowPtr, int);
 
 void mac_newsession(void)
 {
@@ -54,7 +55,7 @@ void mac_newsession(void)
     WinInfo *wi;
     static struct sesslist sesslist;
 
-    s = smalloc(sizeof(*s));
+    s = snew(Session);
     memset(s, 0, sizeof(*s));
     do_defaults(NULL, &s->cfg);
     s->hasfile = FALSE;
@@ -69,9 +70,10 @@ void mac_newsession(void)
     setup_config_box(s->ctrlbox, &sesslist, FALSE, 0);
 
     s->settings_ctrls.data = &s->cfg;
+    s->settings_ctrls.end = &mac_enddlg;
     macctrl_layoutbox(s->ctrlbox, s->settings_window, &s->settings_ctrls);
 
-    wi = smalloc(sizeof(*wi));
+    wi = snew(WinInfo);
     memset(wi, 0, sizeof(*wi));
     wi->s = s;
     wi->mcs = &s->settings_ctrls;
@@ -96,13 +98,24 @@ static void mac_closedlg(WindowPtr window)
 	sfree(s);
 }
 
+static void mac_enddlg(WindowPtr window, int value)
+{
+    Session *s = mac_windowsession(window);
+
+    if (value == 0)
+	mac_closedlg(window);
+    else {
+	mac_startsession(s);
+	mac_closedlg(window);
+    }
+}
 
 void mac_dupsession(void)
 {
     Session *s1 = mac_windowsession(FrontWindow());
     Session *s2;
 
-    s2 = smalloc(sizeof(*s2));
+    s2 = snew(Session);
     memset(s2, 0, sizeof(*s2));
     s2->cfg = s1->cfg;
     s2->hasfile = s1->hasfile;
@@ -118,7 +131,7 @@ static OSErr mac_opensessionfrom(FSSpec *fss)
     void *sesshandle;
     OSErr err;
 
-    s = smalloc(sizeof(*s));
+    s = snew(Session);
     memset(s, 0, sizeof(*s));
 
     err = FSpGetFInfo(fss, &fi);