X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/56ed4cf7fdc391717c35bd1d71520daaff01eb1b..b374e44331e7a57fcd27c7a80f380e1fee7ae675:/mac/mac.c?ds=sidebyside

diff --git a/mac/mac.c b/mac/mac.c
index 5083cdd9..7cbe8c79 100644
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.6 2002/12/10 01:11:40 ben Exp $ */
+/* $Id: mac.c,v 1.8 2002/12/28 22:22:43 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -42,7 +42,9 @@
 #include <Gestalt.h>
 #include <Resources.h>
 #include <Script.h>
+#include <TextCommon.h>
 #include <ToolUtils.h>
+#include <UnicodeConverter.h>
 
 #include <assert.h>
 #include <limits.h>
@@ -100,6 +102,7 @@ int main (int argc, char **argv) {
 
 static void mac_startup(void) {
     Handle menuBar;
+    TECInfoHandle ti;
 
     /* Init Memory Manager */
     MaxApplZone();
@@ -142,6 +145,19 @@ static void mac_startup(void) {
     /* Mac OS 8.5 Window Manager? */
     if (Gestalt(gestaltWindowMgrAttr, &mac_gestalts.windattr) != noErr)
 	mac_gestalts.windattr = 0;
+    /* Text Encoding Conversion Manager? */
+    if (
+#if TARGET_RT_MAC_CFM
+	&TECGetInfo == kUnresolvedCFragSymbolAddress ||
+#else
+	InitializeUnicodeConverter(NULL) != noErr ||
+#endif
+	TECGetInfo(&ti) != noErr)
+	mac_gestalts.encvvers = 0;
+    else {
+	mac_gestalts.encvvers = (*ti)->tecVersion;
+	DisposeHandle((Handle)ti);
+    }
 
     /* We've been tested with the Appearance Manager */
     if (mac_gestalts.apprvers != 0)
@@ -440,11 +456,6 @@ static void mac_openabout(void) {
 }
 
 static void mac_openlicence(void) {
-    DialogItemType itemtype;
-    Handle item;
-    VersRecHndl vers;
-    Rect box;
-    StringPtr longvers;
 
     if (windows.licence)
 	SelectWindow(windows.licence);
@@ -548,6 +559,8 @@ static void mac_adjustcursor(RgnHandle cursrgn) {
 
 static void mac_shutdown(void) {
 
+    if (mac_gestalts.encvvers != 0)
+	TerminateUnicodeConverter();
     exit(0);
 }