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

[From: subversion at stage.maemo.org]

Author: berto
Date: 2009-08-17 12:10:38 +0300 (Mon, 17 Aug 2009)
New Revision: 19135

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktextview.c
Log:
2009-08-17  Alberto Garcia  <agarcia at igalia.com>

	About: NB#131431 (gdk_flush in sapwood is causing tearing)

	* gtk/gtktextview.c (gtk_text_view_size_allocate):
	Restore original GTK+ code modified after Alejandro's latest patch
	using MAEMO_CHANGES guards.

Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-08-13 11:49:08 UTC (rev 19134)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-08-17 09:10:38 UTC (rev 19135)
@@ -1,3 +1,11 @@
+2009-08-17  Alberto Garcia  <agarcia at igalia.com>
+
+	About: NB#131431 (gdk_flush in sapwood is causing tearing)
+
+	* gtk/gtktextview.c (gtk_text_view_size_allocate):
+	Restore original GTK+ code modified after Alejandro's latest patch
+	using MAEMO_CHANGES guards.
+
 2009-08-13  Sven Herzberg  <herzi at lanedo.com>
 
 	Fixes: NB#132734 (crash reporter crashes with RGBA image)

Modified: projects/haf/trunk/gtk+/gtk/gtktextview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-08-13 11:49:08 UTC (rev 19134)
+++ projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-08-17 09:10:38 UTC (rev 19135)
@@ -3407,13 +3407,21 @@
     {
       widget->allocation.height = allocation->height;
     }
+#else
+  widget->allocation = *allocation;
 #endif
 
   if (GTK_WIDGET_REALIZED (widget))
     {
+#ifdef MAEMO_CHANGES
       gdk_window_move_resize (widget->window,
                               widget->allocation.x, widget->allocation.y,
                               widget->allocation.width, widget->allocation.height);
+#else
+      gdk_window_move_resize (widget->window,
+                              allocation->x, allocation->y,
+                              allocation->width, allocation->height);
+#endif
     }
 
   /* distribute width/height among child windows. Ensure all
@@ -3430,7 +3438,11 @@
   else
     focus_edge_width = focus_width;
   
+#ifdef MAEMO_CHANGES
   width = widget->allocation.width - focus_edge_width * 2 - GTK_CONTAINER (text_view)->border_width * 2;
+#else
+  width = allocation->width - focus_edge_width * 2 - GTK_CONTAINER (text_view)->border_width * 2;
+#endif
 
   if (text_view->left_window)
     left_rect.width = text_view->left_window->requisition.width;
@@ -3452,7 +3464,11 @@
   bottom_rect.width = text_rect.width;
 
 
+#ifdef MAEMO_CHANGES
   height = widget->allocation.height - focus_edge_width * 2 - GTK_CONTAINER (text_view)->border_width * 2;
+#else
+  height = allocation->height - focus_edge_width * 2 - GTK_CONTAINER (text_view)->border_width * 2;
+#endif
 
   if (text_view->top_window)
     top_rect.height = text_view->top_window->requisition.height;