summaryrefslogtreecommitdiffstats
path: root/src/prefix.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2010-04-02 23:47:43 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2010-04-02 23:47:43 +0000
commita870a3f925fe2dd16a60f48a956af772988b805b (patch)
tree67af056885662f73d181898f742a7c03a3898a34 /src/prefix.cpp
parent99% German translation update. (diff)
downloadinkscape-a870a3f925fe2dd16a60f48a956af772988b805b.tar.gz
inkscape-a870a3f925fe2dd16a60f48a956af772988b805b.zip
Fix command line invocation on Windows (LP #167455).
Fixed bugs: - https://launchpad.net/bugs/167455 (bzr r9281)
Diffstat (limited to 'src/prefix.cpp')
-rw-r--r--src/prefix.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/prefix.cpp b/src/prefix.cpp
index 8c1dd4f00..92409a7d2 100644
--- a/src/prefix.cpp
+++ b/src/prefix.cpp
@@ -435,11 +435,11 @@ br_extract_prefix (const char *path)
/**
* Return the directory of the .exe that is currently running
*/
-static Glib::ustring win32_getExePath()
+Glib::ustring win32_getExePath()
{
gunichar2 path[2048];
- GetModuleFileNameW(NULL, (WCHAR*) path, 2048);
- gchar *exe = g_utf16_to_utf8(path, -1, NULL, NULL, NULL);
+ GetModuleFileNameW(0, (WCHAR*) path, 2048);
+ gchar *exe = g_utf16_to_utf8(path, -1, 0,0,0);
gchar *dir = g_path_get_dirname(exe);
Glib::ustring ret = dir;
g_free(dir);
@@ -481,7 +481,7 @@ static Glib::ustring win32_getResourcePath(const Glib::ustring &childPath)
*/
char *win32_relative_path(const char *childPath)
{
- static char *returnPath = NULL;
+ static char *returnPath = 0;
if (!childPath)
childPath = "";
Glib::ustring resourcePath = win32_getResourcePath(childPath);