From b090e164232ce1ce19ccafb82a5d3491f275ca41 Mon Sep 17 00:00:00 2001
From: jsiegle <jsiegle@mit.edu>
Date: Wed, 12 Dec 2012 20:42:25 -0500
Subject: [PATCH] Upgraded code in juce_linux_Fonts
---
JuceLibraryCode/src/core/juce_SystemStats.h | 7 +++++++
JuceLibraryCode/src/native/linux/juce_linux_Fonts.cpp | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/JuceLibraryCode/src/core/juce_SystemStats.h b/JuceLibraryCode/src/core/juce_SystemStats.h
index ff062da58..ee31c5360 100755
--- a/JuceLibraryCode/src/core/juce_SystemStats.h
+++ b/JuceLibraryCode/src/core/juce_SystemStats.h
@@ -145,10 +145,17 @@ public:
*/
static int getPageSize();
+ /** Returns an environment variable.
+ If the named value isn't set, this will return the defaultValue string instead.
+ */
+ static String getEnvironmentVariable (const String& name, const String& defaultValue);
+
//==============================================================================
// not-for-public-use platform-specific method gets called at startup to initialise things.
static void initialiseStats();
+
+
private:
struct CPUFlags
{
diff --git a/JuceLibraryCode/src/native/linux/juce_linux_Fonts.cpp b/JuceLibraryCode/src/native/linux/juce_linux_Fonts.cpp
index c60836bc9..5f8d8565b 100755
--- a/JuceLibraryCode/src/native/linux/juce_linux_Fonts.cpp
+++ b/JuceLibraryCode/src/native/linux/juce_linux_Fonts.cpp
@@ -103,7 +103,7 @@ public:
{
const ScopedPointer<XmlElement> fontsInfo (XmlDocument::parse (File ("/etc/fonts/fonts.conf")));
- if (fontsInfo != nullptr)
+ if (fontsInfo != 0)
{
forEachXmlChildElementWithTagName (*fontsInfo, e, "dir")
{
@@ -113,10 +113,10 @@ public:
{
if (e->getStringAttribute ("prefix") == "xdg")
{
- String xdgDataHome (SystemStats::getEnvironmentVariable ("XDG_DATA_HOME", String::empty));
+ String xdgDataHome = "~/.local/share";//(SystemStats::getEnvironmentVariable ("XDG_DATA_HOME", String::empty));
- if (xdgDataHome.trimStart().isEmpty())
- xdgDataHome = "~/.local/share";
+ // if (xdgDataHome.trimStart().isEmpty())
+ // xdgDataHome = "~/.local/share";
fontPath = File (xdgDataHome).getChildFile (fontPath).getFullPathName();
}
--
GitLab