[GRASS-SVN] r36781 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-04-18 08:36:33 -0400 (Sat, 18 Apr 2009)
New Revision: 36781

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
Log:
hcho: Parse font names correctly (e.g., "Luxi Mono:Regular" is not a color value)
     (merge from trunk, r36689)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2009-04-18 12:33:43 UTC (rev 36780)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2009-04-18 12:36:33 UTC (rev 36781)
@@ -686,7 +686,10 @@
             elif value == 'None':
                 value = None
             elif ':' in value: # -> color
-                value = tuple(map(int, value.split(':')))
+                try:
+                    value = tuple(map(int, value.split(':')))
+                except ValueError: # -> string
+                    pass
             else:
                 try:
                     value = int(value)