From 5f1b30cafcf251d52550915e3880609c099095ed Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= jaakko.keranen@iki.fi

Date: Thu, 17 Feb 2022 18:03:32 +0200

Subject: [PATCH 1/1] Don't suggest fonts any more

Now you can just do searches in the font library.

po/en.po | 9 ---------

src/app.c | 4 ++++

2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/po/en.po b/po/en.po

index 22c10e44..bff4c495 100644

--- a/po/en.po

+++ b/po/en.po

@@ -2144,12 +2144,3 @@ msgstr "Permanently dismiss warning about terminal emulation on %s?"

msgid "dlg.dismiss.warning"

msgstr "Dismiss Warning"

-msgid "heading.fontpack.classic"

-msgstr "Download Fontpack"

-msgid "dlg.fontpack.classic.msg"

-msgstr "The fonts previously bundled with the app are now available as a separate download. Would you like to download the "Classic set" fontpack now?"

-msgid "dlg.fontpack.classic"

-msgstr "Download Fontpack (25 MB)"

diff --git a/src/app.c b/src/app.c

index d1e3870a..d47c6ef1 100644

--- a/src/app.c

+++ b/src/app.c

@@ -441,6 +441,7 @@ static void loadPrefs_App_(iApp *d) {

 }

 iRelease(f);

 /* Upgrade checks. */

+#if 0 /* disabled in v1.11 (font library search) */

 if (cmp_Version(&upgradedFromAppVersion, &(iVersion){ 1, 8, 0 }) < 0) {

#if !defined (iPlatformAppleMobile) && !defined (iPlatformAndroidMobile)

     /* When upgrading to v1.8.0, the old hardcoded font library is gone and that means

@@ -450,6 +451,7 @@ static void loadPrefs_App_(iApp *d) {

     postCommand_App("~fontpack.suggest.classic");

#endif

 }

+#endif

#if !defined (LAGRANGE_ENABLE_CUSTOM_FRAME)

 d->prefs.customFrame = iFalse;

#endif

@@ -2289,6 +2291,7 @@ iBool handleCommand_App(const char *cmd) {

                                          suffixPtr_Command(cmd, "where")));

     return iTrue;

 }

+#if 0 /* disabled in v1.11 */

 else if (equal_Command(cmd, "fontpack.suggest.classic")) {

     /* TODO: Don't use this when system fonts are accessible. */

     if (!isInstalled_Fonts("classic-set") && !isInstalled_Fonts("cjk")) {

@@ -2305,6 +2308,7 @@ iBool handleCommand_App(const char *cmd) {

     }

     return iTrue;

 }

+#endif

 else if (equal_Command(cmd, "prefs.changed")) {

     savePrefs_App_(d);

     return iTrue;

--

2.25.1