conduit r1316 - in trunk: . conduit/gtkui

[jstowers svn gnome org]

Author: jstowers
Date: Thu Feb 14 13:58:26 2008
New Revision: 1316
URL: http://svn.gnome.org/viewvc/conduit?rev=1316&view=rev

Log:
2008-02-15  John Stowers  <john stowers gmail com>

	* conduit/gtkui/UI.py: Better approach to supporting RGBA colormaps.
	Fixes bug #515648 (Jon Bolt, Andrea Cimitan)



Modified:
   trunk/ChangeLog
   trunk/conduit/gtkui/UI.py

Modified: trunk/conduit/gtkui/UI.py
==============================================================================
--- trunk/conduit/gtkui/UI.py	(original)
+++ trunk/conduit/gtkui/UI.py	Thu Feb 14 13:58:26 2008
@@ -92,9 +92,8 @@
         if conduit.GLOBALS.settings.get("gui_use_rgba_colormap") == True:
             screen = self.mainWindow.get_screen()
             colormap = screen.get_rgba_colormap()
-            if colormap == None:
-                colormap = screen.get_rgb_colormap()
-            gtk.widget_set_default_colormap(colormap)       
+            if colormap:
+                gtk.widget_set_default_colormap(colormap)
         self.mainWindow.set_position(gtk.WIN_POS_CENTER)
         self.mainWindow.set_icon_name("conduit")
         title = "%s" % conduit.APPNAME