diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gdk/gdk.c | 3 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 3 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +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) + 2006-09-03 Tor Lillqvist <tml@novell.com> * gdk/win32/gdkwindow-win32.c (gdk_window_beep): No @@ -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); } } diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 770cbd1700..92af98a25f 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -551,11 +551,12 @@ post_parse_hook (GOptionContext *context, { if (gdk_display_open_default_libgtk_only () == NULL) { + const char *display_name = gdk_get_display_arg_name (); g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED, "cannot open display: %s", - gdk_get_display_arg_name ()); + display_name ? display_name : "" ); return FALSE; } |