More correct setting of PYTHONPATH at startup

diff --git a/src/Makefile.am b/src/Makefile.am
index 74bfa01d6c98cb8f09b3798efbf2e56e629bbc73..03b58c6108050c96a3f98be372726e4397efe232 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -186,6 +186,7 @@ EXTRA_DIST =        \
        extension/internal/emf-win32-print.h    \
        helper/sp-marshal.list  \
        show-preview.bmp \
+       winconsole.cpp \
        $(jabber_whiteboard_SOURCES) \
        $(CXXTEST_TEMPLATE)
 

diff --git a/src/main.cpp b/src/main.cpp
index a6dfb37f04e41367180fa908354a290669189d44..cd60d9fa16f80c33dc8c4327fc227d1b9d548114 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -545,18 +545,24 @@ static void set_extensions_env()
 {
     gchar const *pythonpath = g_getenv("PYTHONPATH");
     gchar *extdir;
+    gchar *new_pythonpath;
     
 #ifdef WIN32
     extdir = g_win32_locale_filename_from_utf8(INKSCAPE_EXTENSIONDIR);
 #else
     extdir = g_strdup(INKSCAPE_EXTENSIONDIR);
 #endif
+    if (pythonpath) {
+        new_pythonpath = g_strdup_printf("%s" G_SEARCHPATH_SEPARATOR_S "%s",
+                                         extdir, pythonpath);
+        g_free(extdir);
+    } else {
+        new_pythonpath = extdir;
+    }
 
-    gchar *new_pythonpath = g_strdup_printf("%s" G_SEARCHPATH_SEPARATOR_S "%s",
-                                            extdir, pythonpath);
     g_setenv("PYTHONPATH", new_pythonpath, TRUE);
-    g_free(extdir);
     g_free(new_pythonpath);
+    printf("PYTHONPATH = %s", g_getenv("PYTHONPATH"));
 }
 
 /**