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

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-08-13 14:49:08 +0300 (Thu, 13 Aug 2009)
New Revision: 19134

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktextview.c
Log:
2009-08-13  Sven Herzberg  <herzi at lanedo.com>

	Fixes: NB#132734 (crash reporter crashes with RGBA image)

	* gtk/gtktextview.c (gtk_text_view_realize), (text_window_realize):
	make the complete widget RGB. This way we won't run into X11 drawing
	primitives (like XDrawLine for the cursor) that uses the widget's GC
	(with 32bit colormap) on the 16bit windows


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-08-12 14:55:32 UTC (rev 19133)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-08-13 11:49:08 UTC (rev 19134)
@@ -1,3 +1,12 @@
+2009-08-13  Sven Herzberg  <herzi at lanedo.com>
+
+	Fixes: NB#132734 (crash reporter crashes with RGBA image)
+
+	* gtk/gtktextview.c (gtk_text_view_realize), (text_window_realize):
+	make the complete widget RGB. This way we won't run into X11 drawing
+	primitives (like XDrawLine for the cursor) that uses the widget's GC
+	(with 32bit colormap) on the 16bit windows
+
 2009-08-11  Alejandro G. Castro  <alex at igalia.com>
 
 	Fixes: NB#131431 (gdk_flush in sapwood is causing tearing)

Modified: projects/haf/trunk/gtk+/gtk/gtktextview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-08-12 14:55:32 UTC (rev 19133)
+++ projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-08-13 11:49:08 UTC (rev 19134)
@@ -3884,8 +3884,13 @@
   attributes.width = widget->allocation.width;
   attributes.height = widget->allocation.height;
   attributes.wclass = GDK_INPUT_OUTPUT;
+#ifdef MAEMO_CHANGES
+  attributes.colormap = gdk_screen_get_rgb_colormap (gtk_widget_get_screen (widget));
+  attributes.visual = gdk_colormap_get_visual (attributes.colormap);
+#else
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
+#endif
   attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
@@ -8203,10 +8208,6 @@
 
   attributes.x = 0;
   attributes.y = 0;
-#ifdef MAEMO_CHANGES
-  attributes.colormap = gdk_screen_get_rgb_colormap (gtk_widget_get_screen (win->widget));
-  attributes.visual = gdk_colormap_get_visual (attributes.colormap);
-#endif
   attributes.width = win->allocation.width;
   attributes.height = win->allocation.height;
   attributes.event_mask = (GDK_EXPOSURE_MASK            |