Patch from Jens Granseuer <jensgr@gmx.net> to fix on non-C99 compilers.
Mon Jun 2 13:23:25 2003 Jonathan Blandford <jrb@redhat.com> * gnome-settings-xrdb.c (append_xresources): Patch from Jens Granseuer <jensgr@gmx.net> to fix on non-C99 compilers.
This commit is contained in:
parent
8696d98d2f
commit
5e9c5a6e85
2 changed files with 8 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Mon Jun 2 13:23:25 2003 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
|
* gnome-settings-xrdb.c (append_xresources): Patch from Jens
|
||||||
|
Granseuer <jensgr@gmx.net> to fix on non-C99 compilers.
|
||||||
|
|
||||||
2003-05-07 Jody Goldberg <jody@gnome.org>
|
2003-05-07 Jody Goldberg <jody@gnome.org>
|
||||||
|
|
||||||
* Release 2.3.1
|
* Release 2.3.1
|
||||||
|
|
|
@ -251,6 +251,7 @@ static void
|
||||||
append_xresources (GString *string, GError **error)
|
append_xresources (GString *string, GError **error)
|
||||||
{
|
{
|
||||||
const char* home_path;
|
const char* home_path;
|
||||||
|
char *xresources;
|
||||||
|
|
||||||
g_return_if_fail (string != NULL);
|
g_return_if_fail (string != NULL);
|
||||||
|
|
||||||
|
@ -259,7 +260,8 @@ append_xresources (GString *string, GError **error)
|
||||||
g_warning (_("Cannot determine user's home directory"));
|
g_warning (_("Cannot determine user's home directory"));
|
||||||
return;
|
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)) {
|
if (g_file_test (xresources, G_FILE_TEST_EXISTS)) {
|
||||||
append_file (xresources, string, error);
|
append_file (xresources, string, error);
|
||||||
if (*error) {
|
if (*error) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue