diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 10 | ||||
| -rw-r--r-- | pango/pango-context.c | 4 | ||||
| -rw-r--r-- | pango/pango-fontmap.c | 27 |
9 files changed, 74 insertions, 27 deletions
@@ -1,3 +1,13 @@ +Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-fontmap.c: Remove pango_font_map_free_families, + which was no longer in the headers, no longer needed, and + no longer working. + + * pango/pango-fontmap.c (pango_font_map_list_families) + * pango/pango-context.c (pango_context_list_families): Remove + references to pango_font_map_free_families. + 2001-09-19 Havoc Pennington <hp@redhat.com> * pango/opentype/fterrcompat.h: header to abstract the difference diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 7c6faab8..75dcf64e 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,13 @@ +Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-fontmap.c: Remove pango_font_map_free_families, + which was no longer in the headers, no longer needed, and + no longer working. + + * pango/pango-fontmap.c (pango_font_map_list_families) + * pango/pango-context.c (pango_context_list_families): Remove + references to pango_font_map_free_families. + 2001-09-19 Havoc Pennington <hp@redhat.com> * pango/opentype/fterrcompat.h: header to abstract the difference diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 7c6faab8..75dcf64e 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,13 @@ +Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-fontmap.c: Remove pango_font_map_free_families, + which was no longer in the headers, no longer needed, and + no longer working. + + * pango/pango-fontmap.c (pango_font_map_list_families) + * pango/pango-context.c (pango_context_list_families): Remove + references to pango_font_map_free_families. + 2001-09-19 Havoc Pennington <hp@redhat.com> * pango/opentype/fterrcompat.h: header to abstract the difference diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 7c6faab8..75dcf64e 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,13 @@ +Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-fontmap.c: Remove pango_font_map_free_families, + which was no longer in the headers, no longer needed, and + no longer working. + + * pango/pango-fontmap.c (pango_font_map_list_families) + * pango/pango-context.c (pango_context_list_families): Remove + references to pango_font_map_free_families. + 2001-09-19 Havoc Pennington <hp@redhat.com> * pango/opentype/fterrcompat.h: header to abstract the difference diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 7c6faab8..75dcf64e 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,13 @@ +Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-fontmap.c: Remove pango_font_map_free_families, + which was no longer in the headers, no longer needed, and + no longer working. + + * pango/pango-fontmap.c (pango_font_map_list_families) + * pango/pango-context.c (pango_context_list_families): Remove + references to pango_font_map_free_families. + 2001-09-19 Havoc Pennington <hp@redhat.com> * pango/opentype/fterrcompat.h: header to abstract the difference diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 7c6faab8..75dcf64e 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,13 @@ +Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-fontmap.c: Remove pango_font_map_free_families, + which was no longer in the headers, no longer needed, and + no longer working. + + * pango/pango-fontmap.c (pango_font_map_list_families) + * pango/pango-context.c (pango_context_list_families): Remove + references to pango_font_map_free_families. + 2001-09-19 Havoc Pennington <hp@redhat.com> * pango/opentype/fterrcompat.h: header to abstract the difference diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 7c6faab8..75dcf64e 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,13 @@ +Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-fontmap.c: Remove pango_font_map_free_families, + which was no longer in the headers, no longer needed, and + no longer working. + + * pango/pango-fontmap.c (pango_font_map_list_families) + * pango/pango-context.c (pango_context_list_families): Remove + references to pango_font_map_free_families. + 2001-09-19 Havoc Pennington <hp@redhat.com> * pango/opentype/fterrcompat.h: header to abstract the difference diff --git a/pango/pango-context.c b/pango/pango-context.c index 7f5e078f..5a9824a6 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -185,8 +185,8 @@ list_families_foreach (gpointer key, gpointer value, gpointer user_data) /** * pango_context_list_families: * @context: a #PangoContext - * @families: location to store a pointer to an array of strings. - * This array should be freed with pango_font_map_free_families(). + * @families: location to store a pointer to an array of PangoFontFamily *. + * This array should be freed with g_free(). * @n_families: location to store the number of elements in @descs * * List all families for a context. diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c index a7b5b5f2..30685677 100644 --- a/pango/pango-fontmap.c +++ b/pango/pango-fontmap.c @@ -70,8 +70,8 @@ pango_font_map_load_font (PangoFontMap *fontmap, /** * pango_font_map_list_families: * @fontmap: a #PangoFontMap - * @families: location to store a pointer to an array of strings. - * This array should be freed with pango_font_map_free_families(). + * @families: location to store a pointer to an array of PangoFontFamily *. + * This array should be freed with g_free(). * @n_families: location to store the number of elements in @descs * * List all families for a fontmap. @@ -85,26 +85,3 @@ pango_font_map_list_families (PangoFontMap *fontmap, PANGO_FONT_MAP_GET_CLASS (fontmap)->list_families (fontmap, families, n_families); } - -/** - * pango_font_map_free_families: - * @families: a list of families - * @n_families: number of elements in @families - * - * Free a list of families returned from pango_font_map_list_families() - **/ -void -pango_font_map_free_families (gchar **families, - int n_families) -{ - int i; - - g_return_if_fail (n_families == 0 || families != NULL); - - for (i=0; i<n_families; i++) - g_free (families[i]); - - g_free (families); -} - - |