summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorPatrick Storz <eduard.braun2@gmx.de>2019-03-30 19:53:42 +0000
committerPatrick Storz <eduard.braun2@gmx.de>2019-03-30 20:47:00 +0000
commit57b146853fad8497bd8d3b8dce38c14f11f46e48 (patch)
tree2db1c05d5730fa149e6fcf1b185999b4e0bffc64 /src/ui
parentInkscape::IO::Resource: Drop "DATA_DIR" from Type enum (diff)
downloadinkscape-57b146853fad8497bd8d3b8dce38c14f11f46e48.tar.gz
inkscape-57b146853fad8497bd8d3b8dce38c14f11f46e48.zip
Avoid redefining INKSCAPE_DATADIR
Define and use INKSCAPE_DATADIR_REAL instead, which avoids potential include order issues and avoids some semantic ambiguity.
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 68c664832..a3a9baf0f 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -2456,7 +2456,7 @@ void InkscapePreferences::initPageSystem()
_sys_tmp_files.set_editable(false);
_page_system.add_line(true, _("Temporary files: "), _sys_tmp_files, "", _("Location of the temporary files used for autosave"), true);
- _sys_data.set_text( INKSCAPE_DATADIR );
+ _sys_data.set_text( INKSCAPE_DATADIR_REAL );
_sys_data.set_editable(false);
_page_system.add_line(true, _("Inkscape data: "), _sys_data, "", _("Location of Inkscape data"), true);