diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2012-04-22 04:31:59 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2012-04-22 04:31:59 +0000 |
| commit | 81f49cf8d5ec20aa910c81d4ecfe656203370a74 (patch) | |
| tree | f9eba5b45d99b9c3a863efc84e7f32f2b508edca /src/ui | |
| parent | Fix for 979577 : Build fails on Ubuntu Lucid - Replace deprecated gtk_option_... (diff) | |
| download | inkscape-81f49cf8d5ec20aa910c81d4ecfe656203370a74.tar.gz inkscape-81f49cf8d5ec20aa910c81d4ecfe656203370a74.zip | |
Correcting message for lcms2 status. Fixes bug #985623.
Fixed bugs:
- https://launchpad.net/bugs/985623
(bzr r11277)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index b038ae60d..5380e0b6f 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -851,10 +851,10 @@ void InkscapePreferences::initPageIO() Glib::ustring intentLabels[numIntents] = {_("Perceptual"), _("Relative Colorimetric"), _("Saturation"), _("Absolute Colorimetric")}; int intentValues[numIntents] = {0, 1, 2, 3}; -#if !defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if !defined(HAVE_LIBLCMS1) && !defined(HAVE_LIBLCMS2) Gtk::Label* lbl = new Gtk::Label(_("(Note: Color management has been disabled in this build)")); _page_cms.add_line( false, "", *lbl, "", "", true); -#endif // !defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#endif // !defined(HAVE_LIBLCMS1) && !defined(HAVE_LIBLCMS2) _page_cms.add_group_header( _("Display adjustment")); @@ -913,6 +913,8 @@ void InkscapePreferences::initPageIO() _("Enables black point compensation"), false); _cms_proof_preserveblack.init( _("Preserve black"), "/options/softproof/preserveblack", false); + +#if !defined(HAVE_LIBLCMS2) _page_cms.add_line( true, "", _cms_proof_preserveblack, #if defined(cmsFLAGS_PRESERVEBLACK) "", @@ -920,6 +922,7 @@ void InkscapePreferences::initPageIO() _("(LittleCMS 1.15 or later required)"), #endif // defined(cmsFLAGS_PRESERVEBLACK) _("Preserve K channel in CMYK -> CMYK transforms"), false); +#endif // !defined(HAVE_LIBLCMS2) #if !defined(cmsFLAGS_PRESERVEBLACK) _cms_proof_preserveblack.set_sensitive( false ); |