[pango: 28/31] [win32] Don't read pango.aliases
- From: Behdad Esfahbod <behdad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango: 28/31] [win32] Don't read pango.aliases
- Date: Sun, 5 Apr 2015 20:06:10 +0000 (UTC)
commit 4e5e6cf3946846c0cbdb449314473acafce7947a
Author: Behdad Esfahbod <behdad behdad org>
Date: Sat Apr 4 19:35:08 2015 -0700
[win32] Don't read pango.aliases
Part of Bug 733882 - Kill Pango modules, engines, and config files
pango/pangowin32-fontmap.c | 54 --------------------------------------------
1 files changed, 0 insertions(+), 54 deletions(-)
---
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 306d831..956e2ca 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -493,48 +493,9 @@ read_builtin_aliases (GHashTable *ht_aliases)
#endif
-static void
-read_alias_file (const char *filename, GHashTable *ht_aliases)
-{
- FILE *file;
-
- GString *line_buffer;
- char *errstring = NULL;
- int line = 0;
-
- file = g_fopen (filename, "r");
- if (!file)
- return;
-
- line_buffer = g_string_new (NULL);
-
- while (pango_read_line (file, line_buffer) &&
- errstring == NULL)
- {
- line++;
- handle_alias_line (line_buffer, &errstring, ht_aliases);
- }
-
- if (errstring == NULL && ferror (file))
- errstring = g_strdup (g_strerror(errno));
-
- if (errstring)
- {
- g_warning ("error reading alias file: %s:%d: %s\n", filename, line, errstring);
- g_free (errstring);
- }
-
- g_string_free (line_buffer, TRUE);
-
- fclose (file);
-}
-
static GHashTable *
load_aliases (void)
{
- char *filename;
- const char *home;
-
GHashTable *ht_aliases = g_hash_table_new_full ((GHashFunc)alias_hash,
(GEqualFunc)alias_equal,
(GDestroyNotify)alias_free,
@@ -544,21 +505,6 @@ load_aliases (void)
read_builtin_aliases (ht_aliases);
#endif
- filename = g_strconcat (pango_get_sysconf_subdirectory (),
- G_DIR_SEPARATOR_S "pango.aliases",
- NULL);
- read_alias_file (filename, ht_aliases);
- g_free (filename);
-
- home = g_get_home_dir ();
- if (home && *home)
- {
- filename = g_strconcat (home,
- G_DIR_SEPARATOR_S ".pango.aliases",
- NULL);
- read_alias_file (filename, ht_aliases);
- g_free (filename);
- }
return ht_aliases;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]