gnome-terminal r3261 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Tue Dec 16 20:04:19 2008
New Revision: 3261
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3261&view=rev

Log:
Reorder this conditional so we only get the RGBA colourmap if
compositing is enabled.

Modified:
   trunk/src/terminal-window.c

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Tue Dec 16 20:04:19 2008
@@ -1378,8 +1378,8 @@
   GdkColormap *colormap;
 
   screen = gtk_widget_get_screen (GTK_WIDGET (window));
-  colormap = gdk_screen_get_rgba_colormap (screen);
-  if (colormap != NULL && gdk_screen_is_composited (screen))
+  if (gdk_screen_is_composited (screen) &&
+      (colormap = gdk_screen_get_rgba_colormap (screen)) != NULL)
     {
       /* Set RGBA colormap if possible so VTE can use real transparency */
       gtk_widget_set_colormap (widget, colormap);