merge r10596 to version 1.0

git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@10597 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

src/providers/grass/qgsgrassprovider.cpp

@@ -1149,7 +1149,12 @@ void QgsGrassProvider::closeMap( int mapId )
 
     if ( mMaps[mapId].valid )
     {
+      bool mapsetunset = G__getenv( "MAPSET" )==NULL || *G__getenv( "MAPSET" )==0;
+      if( mapsetunset )
+        G__setenv(( char * )"MAPSET", mMaps[mapId].mapset.toAscii().data() );
       Vect_close( mMaps[mapId].map );
+      if( mapsetunset )
+        G__setenv(( char * )"MAPSET", "" );
     }
     mMaps[mapId].valid = false;
   }
@@ -1304,7 +1309,7 @@ QgsCoordinateReferenceSystem QgsGrassProvider::crs()
     struct Key_Value *projunits = G_get_projunits();
     char *wkt = GPJ_grass_to_wkt( projinfo, projunits,  0, 0 );
     Wkt = QString( wkt );
-    free( wkt );
+    G_free( wkt );
   }
 
   setlocale( LC_NUMERIC, oldlocale );