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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2009-04-17 15:52:00 +0300 (Fri, 17 Apr 2009)
New Revision: 18102

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktextview.c
Log:
2009-04-17  Michael Natterer  <mitch at imendio.com>

	Fixes: NB#97380 - Email editor doesn't open correctly when
	launched from other applications

	* gtk/gtktextview.c (gtk_text_view_validate_onscreen): don't
	validate anything if the widget has a height of less than 2 pixels
	so we don't run into the infinite validation loop described in the
	bug that happens when the text view has the default minimum
	allocation of 1x1 pixels.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-04-17 11:59:01 UTC (rev 18101)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-04-17 12:52:00 UTC (rev 18102)
@@ -1,3 +1,14 @@
+2009-04-17  Michael Natterer  <mitch at imendio.com>
+
+	Fixes: NB#97380 - Email editor doesn't open correctly when
+	launched from other applications
+
+	* gtk/gtktextview.c (gtk_text_view_validate_onscreen): don't
+	validate anything if the widget has a height of less than 2 pixels
+	so we don't run into the infinite validation loop described in the
+	bug that happens when the text view has the default minimum
+	allocation of 1x1 pixels.
+
 2009-04-17  Kristian Rietveld  <kris at imendio.com>
 
 	Fixes: NB#110430 - Failed assertion in _gtk_rbtree_node_find_offset()

Modified: projects/haf/trunk/gtk+/gtk/gtktextview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-04-17 11:59:01 UTC (rev 18101)
+++ projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-04-17 12:52:00 UTC (rev 18102)
@@ -3446,8 +3446,12 @@
   GtkWidget *widget = GTK_WIDGET (text_view);
   
   DV(g_print(">Validating onscreen ("G_STRLOC")\n"));
-  
+
+#ifdef MAEMO_CHANGES
+  if (SCREEN_HEIGHT (widget) > 1)
+#else
   if (SCREEN_HEIGHT (widget) > 0)
+#endif
     {
       GtkTextIter first_para;