diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-06-14 20:18:58 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-06-14 20:18:58 +0000 |
| commit | 4df5ab15f1eb6ffaff6afb801e9d6924c4f08ead (patch) | |
| tree | efccf08f8495588da5e0150691be20a7ad5a157a | |
| parent | 60143a8bf82857f3a4534642eb1cd9f65ca1e79d (diff) | |
| download | pango-4df5ab15f1eb6ffaff6afb801e9d6924c4f08ead.tar.gz | |
Fix docs, handle a lone '~' (#169851, Morten Welinder)
2005-06-14 Owen Taylor <otaylor@redhat.com>
* pango/pango-utils.c: Fix docs, handle a lone '~'
(#169851, Morten Welinder)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | pango/pango-utils.c | 7 |
3 files changed, 16 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/pango-utils.c: Fix docs, handle a lone '~' + (#169851, Morten Welinder) + +2005-06-14 Owen Taylor <otaylor@redhat.com> + * configure.in: Force off gtk-doc in absence of Cairo. (#305652, Amit Aronovitch) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 3b275d35..557c32fa 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,10 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/pango-utils.c: Fix docs, handle a lone '~' + (#169851, Morten Welinder) + +2005-06-14 Owen Taylor <otaylor@redhat.com> + * configure.in: Force off gtk-doc in absence of Cairo. (#305652, Amit Aronovitch) diff --git a/pango/pango-utils.c b/pango/pango-utils.c index c30c88d3..586f15ee 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -87,7 +87,7 @@ pango_trim_string (const char *str) /** * pango_split_file_list: - * @str: a comma separated list of filenames + * @str: a G_SEARCHPATH_SEPARATOR separated list of filenames * * Splits a G_SEARCHPATH_SEPARATOR-separated list of files, stripping * white space and subsituting ~/ with $HOME/. @@ -133,6 +133,11 @@ pango_split_file_list (const char *str) g_free (file); file = tmp; } + else if (file[0] == '~' && file[1] == '\0') + { + g_free (file); + file = g_strdup (g_get_home_dir()); + } #endif g_free (files[i]); files[i] = file; |