[rkward-cvs] rkward/rkward/rbackend rthread.cpp,1.39,1.40

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/rbackend
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25726/rbackend

Modified Files:
	rthread.cpp 
Log Message:
Resume work on library locations. Reorganize Settings pages somewhat

Index: rthread.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rthread.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** rthread.cpp	22 Jun 2006 00:12:17 -0000	1.39
--- rthread.cpp	18 Aug 2006 14:37:30 -0000	1.40
***************
*** 386,390 ****
  	delete [] paths;
  
! 	QStringList commands = RKSettingsModuleR::makeRRunTimeOptionCommands ();
  	for (QStringList::const_iterator it = commands.begin (); it != commands.end (); ++it) {
  		runCommandInternal (*it, &error);
--- 386,400 ----
  	delete [] paths;
  
! // find out about standard library locations
! 	char **standardliblocs = getCommandAsStringVector (".libPaths ()\n", &c, &error);
! 	if (error) status |= OtherFail;
! 	for (int i = 0; i < c; ++i) {
! 		RKSettingsModuleRPackages::defaultliblocs.append (standardliblocs[i]);
! 		DELETE_STRING (standardliblocs[i]);
! 	}
! 	delete [] standardliblocs;
! 
! // apply user configurable run time options
! 	QStringList commands = RKSettingsModuleR::makeRRunTimeOptionCommands () + RKSettingsModuleRPackages::makeRRunTimeOptionCommands ();
  	for (QStringList::const_iterator it = commands.begin (); it != commands.end (); ++it) {
  		runCommandInternal (*it, &error);
***************
*** 394,397 ****
--- 404,409 ----
  		}
  	}
+ 
+ // error sink and help browser
  	runCommandInternal ("options (error=quote (.rk.do.error ()))\n", &error);
  	if (error) status |= SinkFail;