[maemo-commits] [maemo-commits] r15646 - in projects/haf/branches/gtk+/OSSO-2.0: . debian gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2008-06-13 13:32:09 +0300 (Fri, 13 Jun 2008)
New Revision: 15646

Modified:
   projects/haf/branches/gtk+/OSSO-2.0/ChangeLog
   projects/haf/branches/gtk+/OSSO-2.0/debian/changelog
   projects/haf/branches/gtk+/OSSO-2.0/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/branches/gtk+/OSSO-2.0/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/OSSO-2.0/ChangeLog	2008-06-13 10:23:04 UTC (rev 15645)
+++ projects/haf/branches/gtk+/OSSO-2.0/ChangeLog	2008-06-13 10:32:09 UTC (rev 15646)
@@ -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-19  Kristian Rietveld  <kris at imendio.com>
 
 	Fixes NB85078: Application do not respond when fullscreen button is

Modified: projects/haf/branches/gtk+/OSSO-2.0/debian/changelog
===================================================================
--- projects/haf/branches/gtk+/OSSO-2.0/debian/changelog	2008-06-13 10:23:04 UTC (rev 15645)
+++ projects/haf/branches/gtk+/OSSO-2.0/debian/changelog	2008-06-13 10:32:09 UTC (rev 15646)
@@ -1,3 +1,14 @@
+gtk+2.0 (2:2.10.12-0osso37) unstable; urgency=low
+
+  * Fixes: NB#86115: maemo-launcher does not work with
+    gtk_init_with_args(). Merged from upstream trunk:
+
+  * gtk/gtkmain.c (gtk_init_with_args): Open the default display
+    even when gtk_parse_args() has already been called.
+    Patch by Mathias Hasselmann
+
+ -- Michael Natterer  <mitch at imendio.com>  Fri, 13 June 2008 12:26:00 +0100
+
 gtk+2.0 (2:2.10.12-0osso36) unstable; urgency=low
 
   * Fixes NB85078: Application do not respond when fullscreen button is

Modified: projects/haf/branches/gtk+/OSSO-2.0/gtk/gtkmain.c
===================================================================
--- projects/haf/branches/gtk+/OSSO-2.0/gtk/gtkmain.c	2008-06-13 10:23:04 UTC (rev 15645)
+++ projects/haf/branches/gtk+/OSSO-2.0/gtk/gtkmain.c	2008-06-13 10:32:09 UTC (rev 15646)
@@ -794,7 +794,7 @@
   gboolean retval;
 
   if (gtk_initialized)
-    return TRUE;
+    return gdk_display_open_default_libgtk_only () != NULL;
 
   gettext_initialization ();