matteo/sgpemv2
matteo/sgpemv2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Add unified Singleton support

Browse source 
git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@643 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
tchernobog 2006-06-21 09:09:50 +00:00
parent 8ca3a61730
commit 383889a203
17 changed files with 193 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/pyloader/src/python_policy_manager.cc
View file

@ -107,10 +107,11 @@ PythonPolicyManager::init()
// environment variables.
// FIXME: find better way to achieve this.
GlobalPreferences& prefs = GlobalPreferences::get_instance();
Glib::ustring importdirs = "import sys\n"
"sys.path[:0] = [ ";
for_each(GlobalPreferences::instance().policies_dir_begin(),
GlobalPreferences::instance().policies_dir_end(),
for_each(prefs.policies_dir_begin(),
prefs.policies_dir_end(),
pol_dirs_concat(importdirs));
importdirs += " '" SHAREDIR "' ]\n";
@ -131,8 +132,9 @@ PythonPolicyManager::get_avail_policies()
void
PythonPolicyManager::collect_policies()
{
GlobalPreferences::dir_iterator dir_it = GlobalPreferences::instance().policies_dir_begin();
GlobalPreferences::dir_iterator dir_end = GlobalPreferences::instance().policies_dir_end();
GlobalPreferences& prefs = GlobalPreferences::get_instance();
GlobalPreferences::dir_iterator dir_it = prefs.policies_dir_begin();
GlobalPreferences::dir_iterator dir_end = prefs.policies_dir_end();
for(; dir_it != dir_end; ++dir_it)
{

2
plugins/pyloader/src/testsuite/test-python_loader.cc
View file

@ -67,7 +67,7 @@ main(int argc, char** argv) {
}
else
// Add argv[1] as the directory to search for uninstalled policies
sgpem::GlobalPreferences::instance().add_policies_dir(argv[1]);
sgpem::GlobalPreferences::get_instance().add_policies_dir(argv[1]);
// Self-register itself to Scheduler, however we don't care about it
TestPythonPolicyManager polman;