summaryrefslogtreecommitdiffstats
path: root/src/extension/dependency.cpp
diff options
context:
space:
mode:
authorMike Pittman <thepittos@yahoo.com.au>2008-04-29 12:50:31 +0000
committerozmikepittman <ozmikepittman@users.sourceforge.net>2008-04-29 12:50:31 +0000
commite3df34083532bb69be2d418fcecc0857bd94a055 (patch)
tree93f498c685b6bc622b2074e013f89c7e0142fc6e /src/extension/dependency.cpp
parenteol-style to native (diff)
downloadinkscape-e3df34083532bb69be2d418fcecc0857bd94a055.tar.gz
inkscape-e3df34083532bb69be2d418fcecc0857bd94a055.zip
Uniconvertor import extension changes for Win32 - Fixes LP# 197617
(bzr r5546)
Diffstat (limited to 'src/extension/dependency.cpp')
-rw-r--r--src/extension/dependency.cpp16
1 files changed, 14 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);