[GRASS-SVN] r63824 - in grass/trunk: display/d.grid general/g.list general/g.region ps/ps.map raster/r.region

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-29 08:46:18 -0800 (Mon, 29 Dec 2014)
New Revision: 63824

Modified:
   grass/trunk/display/d.grid/main.c
   grass/trunk/general/g.list/main.c
   grass/trunk/general/g.region/main.c
   grass/trunk/ps/ps.map/r_wind.c
   grass/trunk/raster/r.region/main.c
Log:
update modules to r63823


Modified: grass/trunk/display/d.grid/main.c
===================================================================
--- grass/trunk/display/d.grid/main.c	2014-12-29 16:45:55 UTC (rev 63823)
+++ grass/trunk/display/d.grid/main.c	2014-12-29 16:46:18 UTC (rev 63824)
@@ -206,7 +206,7 @@
 	G_fatal_error("Invalid direction: %s", direction->answer);
 
     if (align->answer || strcmp(opt2->answer, "0") == 0)
-	G__get_window(&wind, "", "WIND", G_mapset());
+	G_get_element_window(&wind, "", "WIND", G_mapset());
 
     if (strcmp(opt2->answer, "0") == 0) {
 	if (geogrid->answer)

Modified: grass/trunk/general/g.list/main.c
===================================================================
--- grass/trunk/general/g.list/main.c	2014-12-29 16:45:55 UTC (rev 63823)
+++ grass/trunk/general/g.list/main.c	2014-12-29 16:46:18 UTC (rev 63824)
@@ -263,9 +263,9 @@
 	    char name[GNAME_MAX], mapset[GMAPSET_MAX];
 
 	    if (G_name_is_fully_qualified(opt.region->answer, name, mapset))
-		G__get_window(&window, "windows", name, mapset);
+		G_get_element_window(&window, "windows", name, mapset);
 	    else
-		G__get_window(&window, "windows", opt.region->answer, "");
+		G_get_element_window(&window, "windows", opt.region->answer, "");
 	}
     }
     else

Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c	2014-12-29 16:45:55 UTC (rev 63823)
+++ grass/trunk/general/g.region/main.c	2014-12-29 16:46:18 UTC (rev 63824)
@@ -401,7 +401,7 @@
 	mapset = G_find_file2("windows", name, "");
 	if (!mapset)
 	    G_fatal_error(_("Region <%s> not found"), name);
-	G__get_window(&window, "windows", name, mapset);
+	G_get_element_window(&window, "windows", name, mapset);
     }
 
     /* raster= */

Modified: grass/trunk/ps/ps.map/r_wind.c
===================================================================
--- grass/trunk/ps/ps.map/r_wind.c	2014-12-29 16:45:55 UTC (rev 63823)
+++ grass/trunk/ps/ps.map/r_wind.c	2014-12-29 16:46:18 UTC (rev 63824)
@@ -28,7 +28,7 @@
 
     sprintf(fullname, "%s in %s", name, mapset);
 
-    G__get_window(&window, "windows", name, mapset);
+    G_get_element_window(&window, "windows", name, mapset);
 
     width = 1.;
     color_R = color_G = color_B = 0;

Modified: grass/trunk/raster/r.region/main.c
===================================================================
--- grass/trunk/raster/r.region/main.c	2014-12-29 16:45:55 UTC (rev 63823)
+++ grass/trunk/raster/r.region/main.c	2014-12-29 16:46:18 UTC (rev 63824)
@@ -155,7 +155,7 @@
 	G_get_window(&window);
 
     if ((name = parm.region->answer))	/* region= */
-	G__get_window(&window, "windows", name, "");
+	G_get_element_window(&window, "windows", name, "");
 
     if ((name = parm.raster->answer)) {	/* raster= */
 	Rast_get_cellhd(name, "", &window);