[GRASS-SVN] r36096 - in grass/branches/releasebranch_6_4: general/g.gui gui/tcltk/d.m

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-02-25 08:26:30 -0500 (Wed, 25 Feb 2009)
New Revision: 36096

Modified:
   grass/branches/releasebranch_6_4/general/g.gui/main.c
   grass/branches/releasebranch_6_4/gui/tcltk/d.m/menu.tcl
Log:
work-around for d.m weirdness; add debug info (trac #500; merge from devbr6)

Modified: grass/branches/releasebranch_6_4/general/g.gui/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.gui/main.c	2009-02-25 13:22:05 UTC (rev 36095)
+++ grass/branches/releasebranch_6_4/general/g.gui/main.c	2009-02-25 13:26:30 UTC (rev 36096)
@@ -88,8 +88,14 @@
 	 strcmp(gui_type_env, type->answer) != 0) || !gui_type_env) {
 	G_message(_("<%s> is now the default GUI"), type->answer);
 	G_setenv("GRASS_GUI", type->answer);
-
     }
+    else {
+	if(update->answer)
+	    if(gui_type_env) {
+		G_debug(1, "No change: old gui_type_env=[%s], new type->ans=[%s]",
+			gui_type_env, type->answer);
+	    }
+    }
 
     if(nolaunch->answer)
 	exit(EXIT_SUCCESS);

Modified: grass/branches/releasebranch_6_4/gui/tcltk/d.m/menu.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/d.m/menu.tcl	2009-02-25 13:22:05 UTC (rev 36095)
+++ grass/branches/releasebranch_6_4/gui/tcltk/d.m/menu.tcl	2009-02-25 13:26:30 UTC (rev 36096)
@@ -197,7 +197,7 @@
 		{command {[G_msg "Modify access by other users to current mapset"]} {} "g.access" {} -command {execute g.access }}
 		{command {[G_msg "Show current GRASS environment settings"]} {} "g.gisenv" {} -command {run_panel g.gisenv }}
 		{command {[G_msg "Set GRASS environment settings"]} {} "g.gisenv" {} -command {execute g.gisenv }}
-		{command {[G_msg "Change default GUI"]} {} "g.change.gui" {} -command {execute "$env(GISBASE)/etc/gui/scripts/g.change.gui.sh" }}
+		{command {[G_msg "Change default GUI"]} {} "g.gui" {} -command {spawn [list "g.gui" "-nu" "--ui"] }}
 		{command {[G_msg "Show current GRASS version"]} {} "g.version -c" {} -command {run_panel "g.version -c" }}
 	}}
 	{cascad {[G_msg "Manage projections"]} {} "" $tmenu {