From 50f63d05be34c63fad22b5c7ced9dae2b2611cca Mon Sep 17 00:00:00 2001
From: Patrick Storz <eduard.braun2@gmx.de>
Date: Sun, 10 Mar 2019 01:37:13 +0100
Subject: Remove INKSCAPE_PORTABLE_PROFILE_DIR

Please use the (functionally identical) INKSCAPE_PROFILE_DIR instead.

See also
  https://gitlab.com/inkscape/inkscape/issues/114
---
 packaging/snappy/snapcraft.sh                                     | 2 +-
 .../win32/portable/App/AppInfo/Launcher/InkscapePortable.ini      | 2 +-
 src/io/resource.cpp                                               | 8 +-------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/packaging/snappy/snapcraft.sh b/packaging/snappy/snapcraft.sh
index 1bbb29f2f..a9d45120b 100755
--- a/packaging/snappy/snapcraft.sh
+++ b/packaging/snappy/snapcraft.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-export INKSCAPE_PORTABLE_PROFILE_DIR="${SNAP_USER_DATA}"
+export INKSCAPE_PROFILE_DIR="${SNAP_USER_DATA}"
 export INKSCAPE_LOCALEDIR="${SNAP}/share/locale/"
 
 exec "$@"
diff --git a/packaging/win32/portable/App/AppInfo/Launcher/InkscapePortable.ini b/packaging/win32/portable/App/AppInfo/Launcher/InkscapePortable.ini
index 76188e6e1..24856a942 100644
--- a/packaging/win32/portable/App/AppInfo/Launcher/InkscapePortable.ini
+++ b/packaging/win32/portable/App/AppInfo/Launcher/InkscapePortable.ini
@@ -8,7 +8,7 @@ Ghostscript=find
 XML=true
 
 [Environment]
-INKSCAPE_PORTABLE_PROFILE_DIR=%PAL:DataDir%\settings
+INKSCAPE_PROFILE_DIR=%PAL:DataDir%\settings
 HOME=%PAL:DataDir%\settings
 APPDATA=%PAL:DataDir%\settings
 PYTHONHOME=%PAL:AppDir%\Inkscape\python
diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index ff934b2c5..7d41acf65 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -375,14 +375,8 @@ char *profile_path(const char *filename)
 {
     static const gchar *prefdir = nullptr;
 
-
     if (!prefdir) {
-        // First check for a custom environment variable for a "portable app"
-        gchar const *val = g_getenv("INKSCAPE_PORTABLE_PROFILE_DIR");
-        if (val) {
-            prefdir = g_strdup(val);
-        }
-        // Then check for a custom user environment variable
+        // Check if profile directory is overriden using environment variable
         gchar const *userenv = g_getenv("INKSCAPE_PROFILE_DIR");
         if (userenv) {
             prefdir = g_strdup(userenv);
-- 
cgit v1.2.3