diff options
| author | Ted Gould <ted@gould.cx> | 2008-10-31 15:06:16 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-10-31 15:06:16 +0000 |
| commit | 7e67d66e7817a9321c4e94b2184a9226b20b396a (patch) | |
| tree | a857d7aae5f544c4243a331e4eb4e4629bbc27a9 /src/main.cpp | |
| parent | Merge from trunk (diff) | |
| download | inkscape-7e67d66e7817a9321c4e94b2184a9226b20b396a.tar.gz inkscape-7e67d66e7817a9321c4e94b2184a9226b20b396a.zip | |
Merge from trunk
(bzr r6887)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/main.cpp b/src/main.cpp index 229ef65f7..5e1e6f64b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -515,19 +515,10 @@ static int set_extensions_env() char *oldenv = getenv("PYTHONPATH"); Glib::ustring tmp = INKSCAPE_EXTENSIONDIR; if (oldenv != NULL) { -#ifdef WIN32 - tmp += ";"; -#else - tmp += ":"; -#endif + tmp += G_SEARCHPATH_SEPARATOR; tmp += oldenv; } -#ifdef WIN32 - /// \todo this does not work on windows, cannot find the setenv method or an equivalent. - //setenv("PYTHONPATH", tmp.c_str(), 1); -#else - setenv("PYTHONPATH", tmp.c_str(), 1); -#endif + g_setenv("PYTHONPATH", tmp.c_str(), TRUE); return 0; } |