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

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-08-11 11:48:29 +0300 (Tue, 11 Aug 2009)
New Revision: 19108

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c
Log:
2009-08-11  Sven Herzberg  <herzi at lanedo.com>

	About: NB#89864 - [AF Checked] RGBA support

	* gdk/x11/gdkcolor-x11.c (gdk_screen_get_system_colormap): some more
	cleanup (to let the code work like upstream's #if branch


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-08-11 07:54:17 UTC (rev 19107)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-08-11 08:48:29 UTC (rev 19108)
@@ -1,3 +1,10 @@
+2009-08-11  Sven Herzberg  <herzi at lanedo.com>
+
+	About: NB#89864 - [AF Checked] RGBA support
+
+	* gdk/x11/gdkcolor-x11.c (gdk_screen_get_system_colormap): some more
+	cleanup (to let the code work like upstream's #if branch
+
 2009-08-10  Kristian Rietveld  <kris at lanedo.com>
 
 	Fixes: NB#130014 - Crash when long tabbing on a contact which was
@@ -37,7 +44,6 @@
 
 		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

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c	2009-08-11 07:54:17 UTC (rev 19107)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkcolor-x11.c	2009-08-11 08:48:29 UTC (rev 19108)
@@ -369,12 +369,12 @@
   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);
-    }
+  visual = GDK_VISUAL (screen_x11->system_visual);
+  screen_x11->system_colormap = gdk_colormap_new (visual, FALSE);
 
   return screen_x11->system_colormap;
 #else