summaryrefslogtreecommitdiff
path: root/gdk/gdk.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-09-03 05:26:45 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-09-03 05:26:45 +0000
commit805782a574d6dbf5660717ac68cec8d9e5598c75 (patch)
tree5f74d7b0e8b5f894f9c8cb291bf00f1c7074216e /gdk/gdk.c
parentf3ce0228a570212062448183dc775ba0c27b9929 (diff)
downloadgdk-pixbuf-805782a574d6dbf5660717ac68cec8d9e5598c75.tar.gz
Handle display_name being NULL. (#354004, Chris Wilson)
2006-09-03 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmain.c (post_parse_hook): * gdk/gdk.c (gdk_init): Handle display_name being NULL. (#354004, Chris Wilson)
Diffstat (limited to 'gdk/gdk.c')
-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);
}
}