diff options
author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-13 03:24:37 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-13 03:24:37 +0000 |
commit | 809bc59c58c32aeb27e960a81d3dec66d920784a (patch) | |
tree | 6c06ae709187a4d2deab4f20df62bba34caf0d13 | |
parent | 1dc476954fc2731a418dcaeb650a749c2b595794 (diff) | |
download | gdk-pixbuf-809bc59c58c32aeb27e960a81d3dec66d920784a.tar.gz |
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
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | gtk/gtkmain.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -1,5 +1,14 @@ 2008-06-12 Matthias Clasen <mclasen@redhat.com> + 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 <mclasen@redhat.com> + Bug 524222 – GtkToolbar with mix of buttons with and without icons looks "bad" diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index f844af22c..3b1e0b1c4 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 (); |