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

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-01-25 16:08:26 -0500 (Sun, 25 Jan 2009)
New Revision: 35630

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/globalvar.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
Log:
wxGUI: move check for g.mlist to globalvar module
      (merge from trunk, r35628)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/globalvar.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/globalvar.py	2009-01-25 21:07:23 UTC (rev 35629)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/globalvar.py	2009-01-25 21:08:26 UTC (rev 35630)
@@ -138,3 +138,9 @@
 
 """@Toolbar icon size"""
 toolbarSize = (24, 24)
+
+"""@Is g.mlist available?"""
+if 'g.mlist' in grassCmd['all']:
+    have_mlist = True
+else:
+    have_mlist = False

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2009-01-25 21:07:23 UTC (rev 35629)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2009-01-25 21:08:26 UTC (rev 35630)
@@ -212,7 +212,7 @@
                 mapsets[i] = mapsets[0]
                 mapsets[0] = curr_mapset
         
-        if 'g.mlist' in globalvar.grassCmd['all']:
+        if globalvar.have_mlist:
             filesdict = grass.mlist_grouped(elementdict[element])
         else:
             filesdict = grass.list_grouped(elementdict[element])