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

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-08-06 15:41:53 +0300 (Thu, 06 Aug 2009)
New Revision: 19078

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-08-06  Sven Herzberg  <sven at lanedo.com>

	About: NB#89864 - RGBA support

	Re-apply the patch; fix some compile warnings caused by it.

	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-08-06 10:03:01 UTC (rev 19077)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-08-06 12:41:53 UTC (rev 19078)
@@ -1,3 +1,19 @@
+2009-08-06  Sven Herzberg  <sven at lanedo.com>
+
+	About: NB#89864 - RGBA support
+
+	Re-apply the patch; fix some compile warnings caused by it.
+
+	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-08-04  Claudio Saavedra  <csaavedra at igalia.com>
 
 	* gtk/gtklabel.c: (gtk_label_ensure_layout): Decrease width magic

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c	2009-08-06 10:03:01 UTC (rev 19077)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c	2009-08-06 12:41:53 UTC (rev 19078)
@@ -358,16 +358,26 @@
 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);
 
-  if (screen_x11->system_colormap)
-    return screen_x11->system_colormap;
+#ifdef MAEMO_CHANGES
+  if (!screen_x11->system_colormap)
+    {
+      visual = GDK_VISUAL (screen_x11->system_visual);
+      screen_x11->system_colormap = gdk_colormap_new (visual, FALSE);
+    }
 
+  return screen_x11->system_colormap;
+#else
   colormap = g_object_new (GDK_TYPE_COLORMAP, NULL);
   private = GDK_COLORMAP_PRIVATE_DATA (colormap);
 
@@ -406,6 +416,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-08-06 10:03:01 UTC (rev 19077)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkvisual-x11.c	2009-08-06 12:41:53 UTC (rev 19078)
@@ -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 = visuals[i];
+          break;
+#endif
 	}
     }