Merge branch 'master' into f31

fix_nasb.patch

@@ -0,0 +1,72 @@
+From 670fac1eaac2f136c44082b109d2533d23f8c995 Mon Sep 17 00:00:00 2001
+From: Gregory Hellings <greg.hellings@gmail.com>
+Date: Thu, 2 Apr 2020 18:51:33 -0500
+Subject: [PATCH] Remove specific handling of NASB lexica
+
+Removes the handling of NASB lexica that was left from earlier plans to
+have NASHebrew and NASGreek as companion lexica for the NASB module.
+Since those do not exist and are certainly not force-installed, we
+should remove them from the code
+---
+ ChangeLog                  |  4 ++++
+ src/main/module_dialogs.cc | 16 ++++------------
+ src/main/url.cc            | 17 +++++------------
+ 3 files changed, 13 insertions(+), 24 deletions(-)
+
+diff --git a/src/main/module_dialogs.cc b/src/main/module_dialogs.cc
+index 3590fdb9..fcc4fe09 100644
+--- a/src/main/module_dialogs.cc
++++ b/src/main/module_dialogs.cc
+@@ -1084,18 +1084,10 @@ static gint show_strongs(DIALOG_DATA *t, const gchar *type,
+ {
+ 	const gchar *modbuf = NULL;
+ 
+-	if (!strncmp(t->mod_name, "NASB", 4)) {
+-		if (!strcmp(type, "Greek"))
+-			modbuf = "NASGreek";
+-		else
+-			modbuf = "NASHebrew";
+-
+-	} else {
+-		if (!strcmp(type, "Greek"))
+-			modbuf = settings.lex_greek;
+-		else if (!strcmp(type, "Hebrew"))
+-			modbuf = settings.lex_hebrew;
+-	}
++	if (!strcmp(type, "Greek"))
++		modbuf = settings.lex_greek;
++	else if (!strcmp(type, "Hebrew"))
++		modbuf = settings.lex_hebrew;
+ 
+ 	if (clicked) {
+ 		static GtkWidget *dlg;
+diff --git a/src/main/url.cc b/src/main/url.cc
+index 0df5e97d..3c6d09e6 100644
+--- a/src/main/url.cc
++++ b/src/main/url.cc
+@@ -364,20 +364,13 @@ static gint show_strongs(const gchar *stype, const gchar *svalue,
+ {
+ 	const gchar *modbuf = NULL;
+ 
+-	if (!strncmp(settings.MainWindowModule, "NASB", 4)) {
++	if (stype && (*stype != '\0')) {
+ 		if (!strcmp(stype, "Greek"))
+-			modbuf = "NASGreek";
++			modbuf = settings.lex_greek;
+ 		else
+-			modbuf = "NASHebrew";
+-	} else {
+-		if (stype && (*stype != '\0')) {
+-			if (!strcmp(stype, "Greek"))
+-				modbuf = settings.lex_greek;
+-			else
+-				modbuf = settings.lex_hebrew;
+-		} else
+-			modbuf = "InvStrongsRealGreek";
+-	}
++			modbuf = settings.lex_hebrew;
++	} else
++		modbuf = "InvStrongsRealGreek";
+ 
+ 	if (clicked) {
+ 		main_display_dictionary(modbuf, (gchar *)svalue);