summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2006-09-03 05:31:21 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-09-03 05:31:21 +0000
commitd86048284d1d6a2cdc9891c7e01a6ffd518cfb30 (patch)
tree53e3c7e1b0885c04226a76262a5fc75f0c06d66d /gdk
parent91afef3a6e7f9c2fbc74a74e1eede18425aa1e1e (diff)
downloadgdk-pixbuf-d86048284d1d6a2cdc9891c7e01a6ffd518cfb30.tar.gz
handle displayname being NULL in some error paths
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/gdk.c b/gdk/gdk.c
index a6aec950a..64be2ff90 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -328,7 +328,8 @@ gdk_init (int *argc, char ***argv)
{
if (!gdk_init_check (argc, argv))
{
- g_warning ("cannot open display: %s", gdk_get_display_arg_name ());
+ const char *display_name = gdk_get_display_arg_name ();
+ g_warning ("cannot open display: %s", display_name ? display_name : "");
exit(1);
}
}