[maemo-commits] [maemo-commits] r18885 - in projects/haf/trunk/gtk+: . gdk/x11

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-07-20 16:49:31 +0300 (Mon, 20 Jul 2009)
New Revision: 18885

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c
   projects/haf/trunk/gtk+/gdk/x11/gdkvisual-x11.c
Log:
2009-01-14  Sven Herzberg  <sven at imendio.com>

	About: NB#89864 - RGBA support
	Patch by Christian Dywan

	* gdk/x11/gdkcolor-x11.c (gdk_screen_get_system_colormap): return the
	colormap for the system visual now...
	* gdk/x11/gdkvisual-x11.c (_gdk_visual_init): set the RGBA visual as
	the system visual



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-07-20 11:52:36 UTC (rev 18884)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-07-20 13:49:31 UTC (rev 18885)
@@ -1,3 +1,13 @@
+2009-01-14  Sven Herzberg  <sven at imendio.com>
+
+	About: NB#89864 - RGBA support
+	Patch by Christian Dywan
+
+	* gdk/x11/gdkcolor-x11.c (gdk_screen_get_system_colormap): return the
+	colormap for the system visual now...
+	* gdk/x11/gdkvisual-x11.c (_gdk_visual_init): set the RGBA visual as
+	the system visual
+
 2009-07-20  Kristian Rietveld  <kris at lanedo.com>
 
 	Fixes: NB#126846 - Media player crashing at

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c	2009-07-20 11:52:36 UTC (rev 18884)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c	2009-07-20 13:49:31 UTC (rev 18885)
@@ -358,16 +358,28 @@
 GdkColormap *
 gdk_screen_get_system_colormap (GdkScreen *screen)
 {
+#ifdef MAEMO_CHANGES
+  GdkVisual *visual;
+#else
   GdkColormap *colormap = NULL;
   GdkColormapPrivateX11 *private;
+#endif
   GdkScreenX11 *screen_x11;
 
   g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
   screen_x11 = GDK_SCREEN_X11 (screen);
 
+#ifdef MAEMO_CHANGES
+  if (!screen_x11->system_colormap)
+    {
+      visual = screen_x11->system_visual;
+      screen_x11->system_colormap = gdk_colormap_new (visual, FALSE);
+    }
+
   if (screen_x11->system_colormap)
     return screen_x11->system_colormap;
 
+#else
   colormap = g_object_new (GDK_TYPE_COLORMAP, NULL);
   private = GDK_COLORMAP_PRIVATE_DATA (colormap);
 
@@ -406,6 +418,7 @@
   screen_x11->system_colormap = colormap;
   
   return colormap;
+#endif
 }
 
 /**

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkvisual-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkvisual-x11.c	2009-07-20 11:52:36 UTC (rev 18884)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkvisual-x11.c	2009-07-20 13:49:31 UTC (rev 18885)
@@ -259,6 +259,10 @@
 	   visuals[i]->visual.blue_mask  == 0x0000ff))
 	{
 	  screen_x11->rgba_visual = GDK_VISUAL (visuals[i]);
+#ifdef MAEMO_CHANGES
+          screen_x11->system_visual = screen_x11->rgba_visual;
+          break;
+#endif
 	}
     }