From 9aed2d156b6b6957b518b895a9040be98cd42079 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 18 Oct 2001 19:50:08 +0000 Subject: Remove the rest of the silly pango file-reading code from Thu Oct 18 15:48:14 2001 Owen Taylor * pango/pango-utils.h: Remove the rest of the silly pango file-reading code from PANGO_ENABLE_BACKEND, so I can use it in gtkimmodule.c. It's nothing that should be in Pango longterm, but it's not enough code to worry about removing before Pango-2.0. (#61602, Sven Neumann) --- ChangeLog | 9 +++++++++ ChangeLog.pre-1-0 | 9 +++++++++ ChangeLog.pre-1-10 | 9 +++++++++ ChangeLog.pre-1-2 | 9 +++++++++ ChangeLog.pre-1-4 | 9 +++++++++ ChangeLog.pre-1-6 | 9 +++++++++ ChangeLog.pre-1-8 | 9 +++++++++ pango/pango-utils.h | 4 +--- 8 files changed, 64 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec1af2d1..b7882fc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Oct 18 15:48:14 2001 Owen Taylor + + * pango/pango-utils.h: Remove the rest of the + silly pango file-reading code from PANGO_ENABLE_BACKEND, + so I can use it in gtkimmodule.c. It's nothing + that should be in Pango longterm, but it's not + enough code to worry about removing before Pango-2.0. + (#61602, Sven Neumann) + Thu Oct 18 14:40:04 2001 Owen Taylor (Fixes from Frank Belew, #58905) diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index ec1af2d1..b7882fc8 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,12 @@ +Thu Oct 18 15:48:14 2001 Owen Taylor + + * pango/pango-utils.h: Remove the rest of the + silly pango file-reading code from PANGO_ENABLE_BACKEND, + so I can use it in gtkimmodule.c. It's nothing + that should be in Pango longterm, but it's not + enough code to worry about removing before Pango-2.0. + (#61602, Sven Neumann) + Thu Oct 18 14:40:04 2001 Owen Taylor (Fixes from Frank Belew, #58905) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ec1af2d1..b7882fc8 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +Thu Oct 18 15:48:14 2001 Owen Taylor + + * pango/pango-utils.h: Remove the rest of the + silly pango file-reading code from PANGO_ENABLE_BACKEND, + so I can use it in gtkimmodule.c. It's nothing + that should be in Pango longterm, but it's not + enough code to worry about removing before Pango-2.0. + (#61602, Sven Neumann) + Thu Oct 18 14:40:04 2001 Owen Taylor (Fixes from Frank Belew, #58905) diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index ec1af2d1..b7882fc8 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,12 @@ +Thu Oct 18 15:48:14 2001 Owen Taylor + + * pango/pango-utils.h: Remove the rest of the + silly pango file-reading code from PANGO_ENABLE_BACKEND, + so I can use it in gtkimmodule.c. It's nothing + that should be in Pango longterm, but it's not + enough code to worry about removing before Pango-2.0. + (#61602, Sven Neumann) + Thu Oct 18 14:40:04 2001 Owen Taylor (Fixes from Frank Belew, #58905) diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index ec1af2d1..b7882fc8 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +Thu Oct 18 15:48:14 2001 Owen Taylor + + * pango/pango-utils.h: Remove the rest of the + silly pango file-reading code from PANGO_ENABLE_BACKEND, + so I can use it in gtkimmodule.c. It's nothing + that should be in Pango longterm, but it's not + enough code to worry about removing before Pango-2.0. + (#61602, Sven Neumann) + Thu Oct 18 14:40:04 2001 Owen Taylor (Fixes from Frank Belew, #58905) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ec1af2d1..b7882fc8 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +Thu Oct 18 15:48:14 2001 Owen Taylor + + * pango/pango-utils.h: Remove the rest of the + silly pango file-reading code from PANGO_ENABLE_BACKEND, + so I can use it in gtkimmodule.c. It's nothing + that should be in Pango longterm, but it's not + enough code to worry about removing before Pango-2.0. + (#61602, Sven Neumann) + Thu Oct 18 14:40:04 2001 Owen Taylor (Fixes from Frank Belew, #58905) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ec1af2d1..b7882fc8 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +Thu Oct 18 15:48:14 2001 Owen Taylor + + * pango/pango-utils.h: Remove the rest of the + silly pango file-reading code from PANGO_ENABLE_BACKEND, + so I can use it in gtkimmodule.c. It's nothing + that should be in Pango longterm, but it's not + enough code to worry about removing before Pango-2.0. + (#61602, Sven Neumann) + Thu Oct 18 14:40:04 2001 Owen Taylor (Fixes from Frank Belew, #58905) diff --git a/pango/pango-utils.h b/pango/pango-utils.h index e45d219c..7cb1df16 100644 --- a/pango/pango-utils.h +++ b/pango/pango-utils.h @@ -25,8 +25,6 @@ char ** pango_split_file_list (const char *str); -#ifdef PANGO_ENABLE_BACKEND - char *pango_trim_string (const char *str); gint pango_read_line (FILE *stream, GString *str); @@ -38,8 +36,8 @@ gboolean pango_scan_string (const char **pos, gboolean pango_scan_int (const char **pos, int *out); +#ifdef PANGO_ENABLE_BACKEND char * pango_config_key_get (const char *key); - #endif /* PANGO_ENABLE_BACKEND */ /* Functions for parsing textual representations -- cgit v1.2.1