From 5e9c5a6e859ad749d392b1608676e1227aa23772 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Mon, 2 Jun 2003 17:23:25 +0000 Subject: [PATCH] Patch from Jens Granseuer to fix on non-C99 compilers. Mon Jun 2 13:23:25 2003 Jonathan Blandford * gnome-settings-xrdb.c (append_xresources): Patch from Jens Granseuer to fix on non-C99 compilers. --- gnome-settings-daemon/ChangeLog | 5 +++++ gnome-settings-daemon/gnome-settings-xrdb.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index efa2a80c5..0c4b5a9ab 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 2 13:23:25 2003 Jonathan Blandford + + * gnome-settings-xrdb.c (append_xresources): Patch from Jens + Granseuer to fix on non-C99 compilers. + 2003-05-07 Jody Goldberg * Release 2.3.1 diff --git a/gnome-settings-daemon/gnome-settings-xrdb.c b/gnome-settings-daemon/gnome-settings-xrdb.c index de8eaf2d1..aace108a9 100644 --- a/gnome-settings-daemon/gnome-settings-xrdb.c +++ b/gnome-settings-daemon/gnome-settings-xrdb.c @@ -251,6 +251,7 @@ static void append_xresources (GString *string, GError **error) { const char* home_path; + char *xresources; g_return_if_fail (string != NULL); @@ -259,7 +260,8 @@ append_xresources (GString *string, GError **error) g_warning (_("Cannot determine user's home directory")); return; } - char *xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL); + + xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL); if (g_file_test (xresources, G_FILE_TEST_EXISTS)) { append_file (xresources, string, error); if (*error) {