diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | examples/Makefile.am | 6 | ||||
| -rw-r--r-- | pango/fonts.c | 4 | ||||
| -rw-r--r-- | pango/pango-utils.c | 2 | ||||
| -rw-r--r-- | pango/pangocairo-font.c | 2 |
5 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2006-02-01 Behdad Esfahbod <behdad@gnome.org> + + * pango/pango-utils.c, pango/pangocairo-font.c: Initialize warning + history structs more explicitly. (bug #329459) + 2006-01-31 Behdad Esfahbod <behdad@gnome.org> * examples/syriac.utf, examples/tibetan.utf, examples/muru.utf, diff --git a/examples/Makefile.am b/examples/Makefile.am index 64a46151..b9c1420f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -31,14 +31,14 @@ noinst_PROGRAMS = ################################################### if HAVE_FREETYPE -noinst_PROGRAMS += pangoft2-topgm +noinst_PROGRAMS += pangoft2-view endif -pangoft2_topgm_SOURCES = \ +pangoft2_view_SOURCES = \ pangoft2topgm.c \ renderdemo.c \ renderdemo.h -pangoft2_topgm_LDADD = \ +pangoft2_view_LDADD = \ ../pango/libpango-$(PANGO_API_VERSION).la \ ../pango/libpangoft2-$(PANGO_API_VERSION).la \ $(GLIB_LIBS) \ diff --git a/pango/fonts.c b/pango/fonts.c index 98d1fae1..7bf49cbd 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -160,7 +160,9 @@ pango_font_description_set_family_static (PangoFontDescription *desc, * Gets the family name field of a font description. See * pango_font_description_set_family(). * - * Return value: The family name field. (Will be %NULL if not previously set.) + * Return value: the family name field for the font description, or + * %NULL if not previously set. This has the same life-time + * as the font description itself and should not be freed. **/ G_CONST_RETURN char * pango_font_description_get_family (const PangoFontDescription *desc) diff --git a/pango/pango-utils.c b/pango/pango-utils.c index a654dd0d..e9fec5f6 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -58,7 +58,7 @@ struct PangoAlias static GHashTable *pango_aliases_ht = NULL; -PangoWarningHistory _pango_warning_history = {}; +PangoWarningHistory _pango_warning_history = { FALSE, FALSE, FALSE }; /** * pango_trim_string: diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index d78dc6e4..fbba68e3 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -28,7 +28,7 @@ #include "pangocairo-private.h" #include "pango-utils.h" -PangoCairoWarningHistory _pango_cairo_warning_history = {}; +PangoCairoWarningHistory _pango_cairo_warning_history = { FALSE }; GType pango_cairo_font_get_type (void) |