Mercurial > DynamicMail

changeset 31:ef3ea8b38f24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mac: Add setting to Info.plist that allows insecure URLs in embedded HTML. Fixed some new warnings clang is now producing.
author Brian Smith <brian@dbsoft.org>
date Wed, 31 Jul 2019 21:42:33 -0500
parents 7a6d8dfc7e2b
children cd5689839e1e ec6da4b77036
files dmail.c mac/Info.plist
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/dmail.c	Thu Dec 13 02:13:59 2012 -0600
+++ b/dmail.c	Wed Jul 31 21:42:33 2019 -0500
@@ -654,9 +654,9 @@
 		if(dw_window_get_data(window, "raw"))
 		{
 			dw_window_set_data(window, "raw", 0);
-			if(mp->text && mp->text[0])
+			if(mp->text[0])
 				dw_mle_import(mle, mp->text[0], -1);
-			else if(mp->html && mp->html[0])
+			else if(mp->html[0])
 				dw_mle_import(mle, mp->html[0], -1);
 		}
 		else
@@ -1157,9 +1157,9 @@
 	{
 		char *oldtext = NULL;
 
-		if(mp && mp->text && mp->text[0])
+		if(mp && mp->text[0])
 			oldtext = mp->text[0];
-		else if(mp && mp->html && mp->html[0])
+		else if(mp && mp->html[0])
 			oldtext = mp->html[0];
 		else 
 			oldtext = text;
@@ -1176,9 +1176,9 @@
 	}
 	else if(!reply)
 	{
-		if(mp && mp->text && mp->text[0])
+		if(mp && mp->text[0])
 			dw_mle_import(mle, mp->text[0], -1);
-		else if(mp && mp->html && mp->html[0])
+		else if(mp && mp->html[0])
 			dw_mle_import(mle, mp->html[0], -1);
 		else if(text)
 			dw_mle_import(mle, text, -1);
--- a/mac/Info.plist	Thu Dec 13 02:13:59 2012 -0600
+++ b/mac/Info.plist	Wed Jul 31 21:42:33 2019 -0500
@@ -18,5 +18,10 @@
 	<string>0.1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+	    <key>NSAllowsArbitraryLoadsInWebContent</key>
+	    <true/>
+	</dict>
 </dict>
 </plist>