From 051e404d09059b5bf5193846750ae2b913aa13df Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 30 May 2003 04:52:12 +0000 Subject: [PATCH] s/int/gsize/ for g_file_get_contents() (found independently by 2003-05-29 Havoc Pennington * src/theme-parser.c (meta_theme_load): s/int/gsize/ for g_file_get_contents() (found independently by marcus@freebsd.org on SPARC and James Laska on s390x; #113661 * src/main.c (main): fix theme location mentioned in error message --- ChangeLog | 9 +++++++++ src/main.c | 2 +- src/theme-parser.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7764c061..470508400 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-05-29 Havoc Pennington + + * src/theme-parser.c (meta_theme_load): s/int/gsize/ for + g_file_get_contents() (found independently by + marcus@freebsd.org on SPARC and James Laska on s390x; + #113661 + + * src/main.c (main): fix theme location mentioned in error message + 2003-05-29 Ray Strode Get and use double-click speed from GtkSettings (Bug #103218). diff --git a/src/main.c b/src/main.c index f25b61cd4..170bc0e3c 100644 --- a/src/main.c +++ b/src/main.c @@ -346,7 +346,7 @@ main (int argc, char **argv) if (!meta_ui_have_a_theme ()) meta_fatal (_("Could not find a theme! Be sure %s exists and contains the usual themes."), - METACITY_PKGDATADIR"/themes"); + METACITY_DATADIR"/themes"); /* Connect to SM as late as possible - but before managing display, * or we might try to manage a window before we have the session diff --git a/src/theme-parser.c b/src/theme-parser.c index 0ed73c0b1..8ff0a07b1 100644 --- a/src/theme-parser.c +++ b/src/theme-parser.c @@ -4261,7 +4261,7 @@ meta_theme_load (const char *theme_name, GError *error; ParseInfo info; char *text; - int length; + gsize length; char *theme_file; char *theme_dir; MetaTheme *retval;