diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-01 16:19:24 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-01 16:19:24 +0000 |
| commit | 65e65f688f6dc3336742f5d9c6af567db77a741a (patch) | |
| tree | b3c0909fc71bcdf851668136b7168c88da7c99fc /pango | |
| parent | cf6b473b451075178e65e478c75e32d97bd2d100 (diff) | |
| download | pango-65e65f688f6dc3336742f5d9c6af567db77a741a.tar.gz | |
Initialize warning history structs more explicitly. (bug #329459)
2006-02-01 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-utils.c, pango/pangocairo-font.c: Initialize warning
history structs more explicitly. (bug #329459)
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/fonts.c | 4 | ||||
| -rw-r--r-- | pango/pango-utils.c | 2 | ||||
| -rw-r--r-- | pango/pangocairo-font.c | 2 |
3 files changed, 5 insertions, 3 deletions
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) |