[maemo-commits] [maemo-commits] r15645 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2008-06-13 13:23:04 +0300 (Fri, 13 Jun 2008)
New Revision: 15645

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmain.c
Log:
2008-06-13  Michael Natterer  <mitch at imendio.com>

	Fixes: NB#86115: maemo-launcher does not work with
	gtk_init_with_args(). Merged from upstream trunk:

	Bug 537985 ?\226?\128?\147 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



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-06-12 11:43:54 UTC (rev 15644)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-06-13 10:23:04 UTC (rev 15645)
@@ -1,3 +1,15 @@
+2008-06-13  Michael Natterer  <mitch at imendio.com>
+
+	Fixes: NB#86115: maemo-launcher does not work with
+	gtk_init_with_args(). Merged from upstream trunk:
+
+	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-05-05 13:42:57  Tim Janik  <timj at imendio.com>
 
 	* gtk/gtkentry.c (gtk_entry_set_progress_adjustment): new function to

Modified: projects/haf/trunk/gtk+/gtk/gtkmain.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmain.c	2008-06-12 11:43:54 UTC (rev 15644)
+++ projects/haf/trunk/gtk+/gtk/gtkmain.c	2008-06-13 10:23:04 UTC (rev 15645)
@@ -813,7 +813,7 @@
   gboolean retval;
 
   if (gtk_initialized)
-    return TRUE;
+    return gdk_display_open_default_libgtk_only () != NULL;
 
   gettext_initialization ();