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

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-08-04 10:21:13 +0300 (Tue, 04 Aug 2009)
New Revision: 19027

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

	Reverted Patch to permit integration

	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-03 13:21:19 UTC (rev 19026)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-08-04 07:21:13 UTC (rev 19027)
@@ -1,3 +1,17 @@
+2009-08-04  Sven Herzberg  <sven at lanedo.com>
+
+	Reverted Patch to permit integration
+
+	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-31  Michael Natterer  <mitch at lanedo.com>
 
 	Fixes: NB#122395 - hildon_entry_set_placeholder() should be in

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c	2009-08-03 13:21:19 UTC (rev 19026)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c	2009-08-04 07:21:13 UTC (rev 19027)
@@ -358,28 +358,16 @@
 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);
 
@@ -418,7 +406,6 @@
   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-03 13:21:19 UTC (rev 19026)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkvisual-x11.c	2009-08-04 07:21:13 UTC (rev 19027)
@@ -259,10 +259,6 @@
 	   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
 	}
     }