summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-03-10 16:15:28 +0000
committerTom Hacohen <tom@stosb.com>2014-03-10 16:25:14 +0000
commitb9664c1059aca533c7175055535bc15e320b8ff5 (patch)
tree777fd8d26391cadb58be7aedc32f4bd5c964fc03
parentbd039ce80daac9e7bb83296e00d645c9226c4957 (diff)
Evas font: Don't add canvas specific path to the global fontconfig path list.
This will come back when D621 gets in (which implements it correctly).
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index 0e67bf80a9..f8a8a10d5f 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -1281,11 +1281,6 @@ _canvas_font_path_clear(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list EINA_UNUS
1281 eina_stringshare_del(evas->font_path->data); 1281 eina_stringshare_del(evas->font_path->data);
1282 evas->font_path = eina_list_remove(evas->font_path, evas->font_path->data); 1282 evas->font_path = eina_list_remove(evas->font_path, evas->font_path->data);
1283 } 1283 }
1284
1285#ifdef HAVE_FONTCONFIG
1286 if (fc_config)
1287 FcConfigAppFontClear(fc_config);
1288#endif
1289} 1284}
1290 1285
1291EAPI void 1286EAPI void
@@ -1306,10 +1301,6 @@ _canvas_font_path_append(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
1306 e->font_path = eina_list_append(e->font_path, eina_stringshare_add(path)); 1301 e->font_path = eina_list_append(e->font_path, eina_stringshare_add(path));
1307 1302
1308 evas_font_init(); 1303 evas_font_init();
1309#ifdef HAVE_FONTCONFIG
1310 if (fc_config)
1311 FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path);
1312#endif
1313} 1304}
1314 1305
1315EAPI void 1306EAPI void
@@ -1330,10 +1321,6 @@ _canvas_font_path_prepend(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
1330 e->font_path = eina_list_prepend(e->font_path, eina_stringshare_add(path)); 1321 e->font_path = eina_list_prepend(e->font_path, eina_stringshare_add(path));
1331 1322
1332 evas_font_init(); 1323 evas_font_init();
1333#ifdef HAVE_FONTCONFIG
1334 if (fc_config)
1335 FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path);
1336#endif
1337} 1324}
1338 1325
1339EAPI const Eina_List * 1326EAPI const Eina_List *