[GRASS-SVN] r56865 - in grass/trunk/gui/wxpython: core gui_core

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-06-21 02:42:45 -0700 (Fri, 21 Jun 2013)
New Revision: 56865

Modified:
   grass/trunk/gui/wxpython/core/render.py
   grass/trunk/gui/wxpython/gui_core/gselect.py
   grass/trunk/gui/wxpython/gui_core/mapdisp.py
Log:
wxGUI: revert r56800

Modified: grass/trunk/gui/wxpython/core/render.py
===================================================================
--- grass/trunk/gui/wxpython/core/render.py	2013-06-21 07:23:24 UTC (rev 56864)
+++ grass/trunk/gui/wxpython/core/render.py	2013-06-21 09:42:45 UTC (rev 56865)
@@ -451,7 +451,7 @@
         """!Return region projection and map units information
         """
         projinfo = dict()
-        if not grass.find_program('g.proj'):
+        if not grass.find_program('g.proj', ['--help']):
             sys.exit(_("GRASS module '%s' not found. Unable to start map "
                        "display window.") % 'g.proj')
         

Modified: grass/trunk/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/gselect.py	2013-06-21 07:23:24 UTC (rev 56864)
+++ grass/trunk/gui/wxpython/gui_core/gselect.py	2013-06-21 09:42:45 UTC (rev 56865)
@@ -1803,7 +1803,7 @@
                                 driver = 'pg').splitlines()
                 if db is not None:
                     win.SetItems(sorted(db))
-                elif grass.find_program('psql'):
+                elif grass.find_program('psql', ['--help']):
                     if not win.GetItems():
                         p = grass.Popen(['psql', '-ltA'], stdout = grass.PIPE)
                         ret = p.communicate()[0]

Modified: grass/trunk/gui/wxpython/gui_core/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/mapdisp.py	2013-06-21 07:23:24 UTC (rev 56864)
+++ grass/trunk/gui/wxpython/gui_core/mapdisp.py	2013-06-21 09:42:45 UTC (rev 56865)
@@ -105,7 +105,7 @@
     def _initMap(self, Map):
         """!Initialize map display, set dimensions and map region
         """
-        if not grass.find_program('g.region'):
+        if not grass.find_program('g.region', ['--help']):
             sys.exit(_("GRASS module '%s' not found. Unable to start map "
                        "display window.") % 'g.region')