diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 11 | ||||
| -rw-r--r-- | pango/pango-utils.c | 4 | ||||
| -rw-r--r-- | pango/pango-utils.h | 4 | ||||
| -rw-r--r-- | pango/pangox-fontcache.c | 2 | ||||
| -rw-r--r-- | pango/pangox.h | 2 |
11 files changed, 83 insertions, 6 deletions
@@ -1,3 +1,14 @@ +2001-02-20 Havoc Pennington <hp@pobox.com> + + Patch from Soeren Sandmann + + * pango/pangox-fontcache.c (pango_x_font_cache_load): make xlfd + arg const + + * pango/pango-utils.c (pango_get_sysconf_subdirectory): + G_CONST_RETURN + (pango_get_lib_subdirectory): G_CONST_RETURN + 2001-02-19 Hans Breuer <hans@breuer.org> * pango/modules.h, pango/pangowin32.c (pango_win32_get_context) : added _pango_included_win32_modules[] to include modules with plain diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 8356faa1..00362518 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,14 @@ +2001-02-20 Havoc Pennington <hp@pobox.com> + + Patch from Soeren Sandmann + + * pango/pangox-fontcache.c (pango_x_font_cache_load): make xlfd + arg const + + * pango/pango-utils.c (pango_get_sysconf_subdirectory): + G_CONST_RETURN + (pango_get_lib_subdirectory): G_CONST_RETURN + 2001-02-19 Hans Breuer <hans@breuer.org> * pango/modules.h, pango/pangowin32.c (pango_win32_get_context) : added _pango_included_win32_modules[] to include modules with plain diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8356faa1..00362518 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,14 @@ +2001-02-20 Havoc Pennington <hp@pobox.com> + + Patch from Soeren Sandmann + + * pango/pangox-fontcache.c (pango_x_font_cache_load): make xlfd + arg const + + * pango/pango-utils.c (pango_get_sysconf_subdirectory): + G_CONST_RETURN + (pango_get_lib_subdirectory): G_CONST_RETURN + 2001-02-19 Hans Breuer <hans@breuer.org> * pango/modules.h, pango/pangowin32.c (pango_win32_get_context) : added _pango_included_win32_modules[] to include modules with plain diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 8356faa1..00362518 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,14 @@ +2001-02-20 Havoc Pennington <hp@pobox.com> + + Patch from Soeren Sandmann + + * pango/pangox-fontcache.c (pango_x_font_cache_load): make xlfd + arg const + + * pango/pango-utils.c (pango_get_sysconf_subdirectory): + G_CONST_RETURN + (pango_get_lib_subdirectory): G_CONST_RETURN + 2001-02-19 Hans Breuer <hans@breuer.org> * pango/modules.h, pango/pangowin32.c (pango_win32_get_context) : added _pango_included_win32_modules[] to include modules with plain diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 8356faa1..00362518 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,14 @@ +2001-02-20 Havoc Pennington <hp@pobox.com> + + Patch from Soeren Sandmann + + * pango/pangox-fontcache.c (pango_x_font_cache_load): make xlfd + arg const + + * pango/pango-utils.c (pango_get_sysconf_subdirectory): + G_CONST_RETURN + (pango_get_lib_subdirectory): G_CONST_RETURN + 2001-02-19 Hans Breuer <hans@breuer.org> * pango/modules.h, pango/pangowin32.c (pango_win32_get_context) : added _pango_included_win32_modules[] to include modules with plain diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 8356faa1..00362518 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,14 @@ +2001-02-20 Havoc Pennington <hp@pobox.com> + + Patch from Soeren Sandmann + + * pango/pangox-fontcache.c (pango_x_font_cache_load): make xlfd + arg const + + * pango/pango-utils.c (pango_get_sysconf_subdirectory): + G_CONST_RETURN + (pango_get_lib_subdirectory): G_CONST_RETURN + 2001-02-19 Hans Breuer <hans@breuer.org> * pango/modules.h, pango/pangowin32.c (pango_win32_get_context) : added _pango_included_win32_modules[] to include modules with plain diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 8356faa1..00362518 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,14 @@ +2001-02-20 Havoc Pennington <hp@pobox.com> + + Patch from Soeren Sandmann + + * pango/pangox-fontcache.c (pango_x_font_cache_load): make xlfd + arg const + + * pango/pango-utils.c (pango_get_sysconf_subdirectory): + G_CONST_RETURN + (pango_get_lib_subdirectory): G_CONST_RETURN + 2001-02-19 Hans Breuer <hans@breuer.org> * pango/modules.h, pango/pangowin32.c (pango_win32_get_context) : added _pango_included_win32_modules[] to include modules with plain diff --git a/pango/pango-utils.c b/pango/pango-utils.c index eb8e2c31..f0a5aafd 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -616,7 +616,7 @@ pango_config_key_get (const char *key) return g_strdup (g_hash_table_lookup (config_hash, key)); } -char * +G_CONST_RETURN char * pango_get_sysconf_subdirectory (void) { #ifdef G_OS_WIN32 @@ -632,7 +632,7 @@ pango_get_sysconf_subdirectory (void) #endif } -char * +G_CONST_RETURN char * pango_get_lib_subdirectory (void) { #ifdef G_OS_WIN32 diff --git a/pango/pango-utils.h b/pango/pango-utils.h index bac20699..f688070e 100644 --- a/pango/pango-utils.h +++ b/pango/pango-utils.h @@ -65,13 +65,13 @@ gboolean pango_parse_stretch (const char *str, * stored in the registry). The returned string should not be * g_free'd. */ -char * pango_get_sysconf_subdirectory (void); +G_CONST_RETURN char * pango_get_sysconf_subdirectory (void); /* Ditto for LIBDIR/pango. On Win32, use the same Pango * installation directory. This returned string should not be * g_free'd either. */ -char * pango_get_lib_subdirectory (void); +G_CONST_RETURN char * pango_get_lib_subdirectory (void); /* A couple of routines from fribidi that we either wrap or diff --git a/pango/pangox-fontcache.c b/pango/pangox-fontcache.c index 14b17a70..ff606f03 100644 --- a/pango/pangox-fontcache.c +++ b/pango/pangox-fontcache.c @@ -138,7 +138,7 @@ cache_entry_unref (PangoXFontCache *cache, CacheEntry *entry) **/ XFontStruct * pango_x_font_cache_load (PangoXFontCache *cache, - char *xlfd) + const char *xlfd) { CacheEntry *entry; diff --git a/pango/pangox.h b/pango/pangox.h index 85dedbe4..a56fda91 100644 --- a/pango/pangox.h +++ b/pango/pangox.h @@ -92,7 +92,7 @@ PangoXFontCache *pango_x_font_cache_new (Display *display); void pango_x_font_cache_free (PangoXFontCache *cache); XFontStruct * pango_x_font_cache_load (PangoXFontCache *cache, - char *xlfd); + const char *xlfd); void pango_x_font_cache_unload (PangoXFontCache *cache, XFontStruct *fs); |