summaryrefslogtreecommitdiff
path: root/src/xsane-device-preferences.c
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:35 +0000
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:35 +0000
commit1083fdcdb608210a42e00fc6819a6d5ce5996b2a (patch)
tree516ac97c6e36375d66b6cfbfbdb430eea8a46c0c /src/xsane-device-preferences.c
parent129ed4b29e21fdb8bda3bee89c3e5d8cca6ba749 (diff)
Imported Upstream version 0.994upstream/0.994
Diffstat (limited to 'src/xsane-device-preferences.c')
-rw-r--r--src/xsane-device-preferences.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/xsane-device-preferences.c b/src/xsane-device-preferences.c
index 41293e6..ce05cae 100644
--- a/src/xsane-device-preferences.c
+++ b/src/xsane-device-preferences.c
@@ -440,7 +440,10 @@ void xsane_device_preferences_load_file(char *filename)
xsane.negative = 0;
xsane.show_preview = 1;
+ xsane.enable_color_management = 0;
+
fd = open(filename, O_RDONLY);
+
if (fd >= 0)
{
/* prepare wire */
@@ -562,6 +565,17 @@ void xsane_device_preferences_load_file(char *filename)
}
}
}
+
+ if (!xsane.scanner_default_color_icm_profile)
+ {
+ xsane.scanner_default_color_icm_profile = strdup("");
+ }
+
+ if (!xsane.scanner_default_gray_icm_profile)
+ {
+ xsane.scanner_default_gray_icm_profile = strdup("");
+ }
+
gtk_window_move(GTK_WINDOW(xsane.dialog), xsane.dialog_posx, xsane.dialog_posy);
gtk_window_set_default_size(GTK_WINDOW(xsane.dialog), xsane.dialog_width, xsane.dialog_height);