1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
|
From: Josue Abarca <jmaslibre@debian.org>
Date: Fri, 12 Feb 2016 17:06:21 +0100
Subject: Change fonts path
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Description: This patch changes the path where denemo looks for the fonts.
Forwarded: not-needed
Author: Josué Abarca <jmaslibre@debian.org>
Last-Update: 2014-08-31
---
include/denemo/denemo.h | 2 +-
src/core/utils.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/denemo/denemo.h b/include/denemo/denemo.h
index a11dd41..b673484 100644
--- a/include/denemo/denemo.h
+++ b/include/denemo/denemo.h
@@ -163,7 +163,7 @@ extern const gchar *Fluidsynth;
#define UI_DIR "ui"
#define SOUNDFONTS_DIR "soundfonts"
#define PIXMAPS_DIR "pixmaps"
-#define FONTS_DIR "fonts"
+#define FONTS_DIR "denemo"
#define LOCALE_DIR "po"
#define LILYPOND_INCLUDE_DIR "actions/lilypond"
diff --git a/src/core/utils.c b/src/core/utils.c
index 7f4e27c..d725d76 100644
--- a/src/core/utils.c
+++ b/src/core/utils.c
@@ -3332,10 +3332,11 @@ get_system_dir (DenemoDirectory dir)
{
switch (dir)
{
+ case DENEMO_DIR_FONTS:
+ return g_build_filename ("/usr/share/fonts/truetype/", get_local_dir (dir), NULL);
case DENEMO_DIR_COMMANDS:
case DENEMO_DIR_UI:
case DENEMO_DIR_SOUNDFONTS:
- case DENEMO_DIR_FONTS:
case DENEMO_DIR_LILYPOND_INCLUDE:
return g_build_filename (get_system_data_dir (), get_local_dir (dir), NULL);
case DENEMO_DIR_PIXMAPS:
|