From 94a48c78ce73fb84ab345635439e15acad481742 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Tue, 4 Dec 2007 17:58:52 +0000 Subject: [PATCH] Patch by: Brian Cameron 2007-12-04 Jens Granseuer Patch by: Brian Cameron * gtkrc-utils.c: (gtkrc_get_details), (gtkrc_get_color_scheme): printing NULL strings crashes on Solaris so don't do that (bug #501391) svn path=/trunk/; revision=8309 --- capplets/common/ChangeLog | 7 +++++++ capplets/common/gtkrc-utils.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index d952ae5cb..26ddab6d9 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,10 @@ +2007-12-04 Jens Granseuer + + Patch by: Brian Cameron + + * gtkrc-utils.c: (gtkrc_get_details), (gtkrc_get_color_scheme): + printing NULL strings crashes on Solaris so don't do that (bug #501391) + 20007-11-12 Rodrigo Moya * gnome-theme-info.c: diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c index 844778241..acc29a3a9 100644 --- a/capplets/common/gtkrc-utils.c +++ b/capplets/common/gtkrc-utils.c @@ -104,7 +104,8 @@ gtkrc_get_details (gchar *filename, GSList **engines, GSList **symbolic_colors) file = g_open (filename, O_RDONLY); if (file == -1) { - g_warning ("Could not open file \"%s\"", filename); + g_warning ("Could not open file \"%s\"", + filename ? filename : "(null)"); } else { @@ -192,7 +193,8 @@ gtkrc_get_color_scheme (gchar *filename) file = g_open (filename, O_RDONLY); if (file == -1) { - g_warning ("Could not open file \"%s\"", filename); + g_warning ("Could not open file \"%s\"", + filename ? filename : "(null)"); } else {