diff options
| author | Mike Pittman <thepittos@yahoo.com.au> | 2008-04-29 12:50:31 +0000 |
|---|---|---|
| committer | ozmikepittman <ozmikepittman@users.sourceforge.net> | 2008-04-29 12:50:31 +0000 |
| commit | e3df34083532bb69be2d418fcecc0857bd94a055 (patch) | |
| tree | 93f498c685b6bc622b2074e013f89c7e0142fc6e /src | |
| parent | eol-style to native (diff) | |
| download | inkscape-e3df34083532bb69be2d418fcecc0857bd94a055.tar.gz inkscape-e3df34083532bb69be2d418fcecc0857bd94a055.zip | |
Uniconvertor import extension changes for Win32 - Fixes LP# 197617
(bzr r5546)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/dependency.cpp | 16 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp index 4396017fa..de656201c 100644 --- a/src/extension/dependency.cpp +++ b/src/extension/dependency.cpp @@ -213,17 +213,29 @@ Dependency::check (void) const g_free(orig_path); return TRUE; } + // give it a 2nd try with ".exe" added - gchar * final_name_exe = g_strdup_printf ("%s.exe", final_name); + gchar * final_name_exe = g_strdup_printf("%s.exe", final_name); if (Glib::file_test(final_name_exe, filetest)) { g_free(final_name); g_free(final_name_exe); g_free(orig_path); return TRUE; } + g_free(final_name_exe); + + // and a 3rd try with ".cmd" added (mainly for UniConvertor) + gchar * final_name_cmd = g_strdup_printf("%s.cmd", final_name); + if (Glib::file_test(final_name_cmd, filetest)) { + g_free(final_name); + g_free(final_name_cmd); + g_free(orig_path); + return TRUE; + } + g_free(final_name_cmd); + // give up g_free(final_name); - g_free(final_name_exe); } g_free(orig_path); diff --git a/src/main.cpp b/src/main.cpp index bf1662c31..eafa07c53 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -440,6 +440,8 @@ static int _win32_set_inkscape_env(char *argv0) tmp += szFullPath; tmp += "python;"; tmp += szFullPath; + tmp += "python\\Scripts;"; // for uniconv.cmd + tmp += szFullPath; tmp += "perl"; if(oldenv != NULL) { tmp += ";"; |