callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modules: honor GimpColorConfig.display_profile_from_gdk again

Browse Source 
I broke this during some recent refactoring.
This commit is contained in:
Michael Natterer
2015-05-30 01:06:25 +02:00
parent 281a529b0c
commit 9096ceffde
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/display-filter-lcms.c
View File

@ -289,8 +289,8 @@ cdisplay_lcms_get_display_profile (CdisplayLcms *lcms)
{ {
GimpColorConfig *config; GimpColorConfig *config;
GimpColorManaged *managed; GimpColorManaged *managed;
GtkWidget *widget = NULL; GtkWidget *widget = NULL;
GimpColorProfile profile; GimpColorProfile profile = NULL;
config = gimp_color_display_get_config (GIMP_COLOR_DISPLAY (lcms)); config = gimp_color_display_get_config (GIMP_COLOR_DISPLAY (lcms));
managed = gimp_color_display_get_managed (GIMP_COLOR_DISPLAY (lcms)); managed = gimp_color_display_get_managed (GIMP_COLOR_DISPLAY (lcms));
@ -298,7 +298,8 @@ cdisplay_lcms_get_display_profile (CdisplayLcms *lcms)
if (GTK_IS_WIDGET (managed)) if (GTK_IS_WIDGET (managed))
widget = gtk_widget_get_toplevel (GTK_WIDGET (managed)); widget = gtk_widget_get_toplevel (GTK_WIDGET (managed));
profile = gimp_widget_get_color_profile (widget); if (config->display_profile_from_gdk)
profile = gimp_widget_get_color_profile (widget);
if (! profile) if (! profile)
profile = gimp_color_config_get_display_profile (config, NULL); profile = gimp_color_config_get_display_profile (config, NULL);