From 809bc59c58c32aeb27e960a81d3dec66d920784a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 13 Jun 2008 03:24:37 +0000 Subject: [PATCH] Open the default display even when gtk_parse_args() has already been * gtk/gtkmain.c (gtk_init_with_args): Open the default display even when gtk_parse_args() has already been called. Patch by Mathias Hasselmann svn path=/trunk/; revision=20366 --- ChangeLog | 9 +++++++++ gtk/gtkmain.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 56f6e8462f..eb1ef4cb5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-06-12 Matthias Clasen + + Bug 537985 – gtk_init_with_args() doesn't open a display after + gtk_parse_args() + + * gtk/gtkmain.c (gtk_init_with_args): Open the default display + even when gtk_parse_args() has already been called. + Patch by Mathias Hasselmann + 2008-06-12 Matthias Clasen Bug 524222 – GtkToolbar with mix of buttons with and without diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index f844af22c4..3b1e0b1c4b 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -819,7 +819,7 @@ gtk_init_with_args (int *argc, gboolean retval; if (gtk_initialized) - return TRUE; + return gdk_display_open_default_libgtk_only () != NULL; gettext_initialization ();