[gimp] app: more filename -> GFile in gimp-fonts.c
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: more filename -> GFile in gimp-fonts.c
- Date: Tue, 29 Jul 2014 12:41:46 +0000 (UTC)
commit 9751d04b474577a57a2542dbae8bea28e1deeb44
Author: Michael Natterer <mitch gimp org>
Date: Tue Jul 29 14:40:25 2014 +0200
app: more filename -> GFile in gimp-fonts.c
app/text/gimp-fonts.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/app/text/gimp-fonts.c b/app/text/gimp-fonts.c
index a0b0704..2d5c8e7 100644
--- a/app/text/gimp-fonts.c
+++ b/app/text/gimp-fonts.c
@@ -41,7 +41,7 @@
static gboolean gimp_fonts_load_fonts_conf (FcConfig *config,
- gchar *fonts_conf);
+ GFile *fonts_conf);
static void gimp_fonts_add_directories (FcConfig *config,
GList *path);
@@ -62,7 +62,7 @@ void
gimp_fonts_load (Gimp *gimp)
{
FcConfig *config;
- gchar *fonts_conf;
+ GFile *fonts_conf;
GList *path;
g_return_if_fail (GIMP_IS_FONT_LIST (gimp->fonts));
@@ -81,11 +81,11 @@ gimp_fonts_load (Gimp *gimp)
if (! config)
goto cleanup;
- fonts_conf = gimp_personal_rc_file (CONF_FNAME);
+ fonts_conf = gimp_directory_file (CONF_FNAME, NULL);
if (! gimp_fonts_load_fonts_conf (config, fonts_conf))
goto cleanup;
- fonts_conf = g_build_filename (gimp_sysconf_directory (), CONF_FNAME, NULL);
+ fonts_conf = gimp_sysconf_directory_file (CONF_FNAME, NULL);
if (! gimp_fonts_load_fonts_conf (config, fonts_conf))
goto cleanup;
@@ -122,17 +122,19 @@ gimp_fonts_reset (Gimp *gimp)
static gboolean
gimp_fonts_load_fonts_conf (FcConfig *config,
- gchar *fonts_conf)
+ GFile *fonts_conf)
{
- gboolean ret = TRUE;
+ gchar *path = g_file_get_path (fonts_conf);
+ gboolean ret = TRUE;
- if (! FcConfigParseAndLoad (config, (const guchar *) fonts_conf, FcFalse))
+ if (! FcConfigParseAndLoad (config, (const guchar *) path, FcFalse))
{
FcConfigDestroy (config);
ret = FALSE;
}
- g_free (fonts_conf);
+ g_free (path);
+ g_object_unref (fonts_conf);
return ret;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]