diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2008-11-27 21:35:19 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2008-11-27 21:35:19 +0000 |
| commit | 414de3cc7a9446a22b87e6215bc1570f03823aa7 (patch) | |
| tree | 37ddf4d047eb275c0ce12a7703ebf365aac01f99 /src/ui | |
| parent | Fix compile with lcms disabled. (diff) | |
| download | inkscape-414de3cc7a9446a22b87e6215bc1570f03823aa7.tar.gz inkscape-414de3cc7a9446a22b87e6215bc1570f03823aa7.zip | |
Rearrange to enable code that does not directly rely on lcms.
(bzr r6910)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 43d1ea88c..b1a14e781 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -816,16 +816,12 @@ void InkscapePreferences::initPageCMS() _page_cms.add_group_header( _("Display adjustment")); -#if ENABLE_LCMS Glib::ustring tmpStr; - std::list<gchar *> sources = ColorProfile::getProfileDirs(); - while (!sources.empty()) { - gchar* dirname = sources.front(); - gchar* part = g_strdup_printf("\n%s", dirname); + std::list<Glib::ustring> sources = ColorProfile::getProfileDirs(); + for ( std::list<Glib::ustring>::const_iterator it = sources.begin(); it != sources.end(); ++it ) { + gchar* part = g_strdup_printf( "\n%s", it->c_str() ); tmpStr += part; g_free(part); - g_free(dirname); - sources.pop_front(); } gchar* profileTip = g_strdup_printf(_("The ICC profile to use to calibrate display output.\nSearched directories:%s"), tmpStr.c_str()); @@ -833,7 +829,6 @@ void InkscapePreferences::initPageCMS() profileTip, false); g_free(profileTip); profileTip = 0; -#endif // ENABLE_LCMS _cms_from_display.init( _("Retrieve profile from display"), "/options/displayprofile/from_display", false); _page_cms.add_line( false, "", _cms_from_display, "", |