From 41f5d7c4a8e9469bdfd1490d3c3f00f0c24500b8 Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Sun, 3 Oct 2021 12:05:00 +0100
Subject: [PATCH] Buf fix #927: Option "Auto rotate proofs using Exif
 information" doesn't stick

https://github.com/BestImageViewer/geeqie/issues/927

This option is not used and is now deleted.
---
 doc/docbook/GuideOptionsImage.xml | 13 -------------
 src/options.c                     |  1 -
 src/options.h                     |  1 -
 src/preferences.c                 |  6 ------
 4 files changed, 21 deletions(-)

diff --git a/doc/docbook/GuideOptionsImage.xml b/doc/docbook/GuideOptionsImage.xml
index 9f2a0281..b3065d91 100644
--- a/doc/docbook/GuideOptionsImage.xml
+++ b/doc/docbook/GuideOptionsImage.xml
@@ -165,17 +165,4 @@
       </varlistentry>
     </variablelist>
   </section>
-  <section id="Convenience">
-    <title>Convenience</title>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <guilabel>Auto rotate proofs using EXIF information</guilabel>
-        </term>
-        <listitem>
-          <para>Auto rotate images on print proof sheet.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </section>
 </section>
diff --git a/src/options.c b/src/options.c
index 875a65b9..536539ca 100644
--- a/src/options.c
+++ b/src/options.c
@@ -106,7 +106,6 @@ ConfOptions *init_options(ConfOptions *options)
 	options->image.alpha_color_2.blue = 0x006666;
 	options->image.enable_read_ahead = TRUE;
 	options->image.exif_rotate_enable = TRUE;
-	options->image.exif_proof_rotate_enable = TRUE;
 	options->image.fit_window_to_image = FALSE;
 	options->image.limit_autofit_size = FALSE;
 	options->image.limit_window_size = TRUE;
diff --git a/src/options.h b/src/options.h
index 668cf526..1492e413 100644
--- a/src/options.h
+++ b/src/options.h
@@ -137,7 +137,6 @@ struct _ConfOptions
 	/* image */
 	struct {
 		gboolean exif_rotate_enable;
-		gboolean exif_proof_rotate_enable;
 		guint scroll_reset_method;
 		gboolean fit_window_to_image;
 		gboolean limit_window_size;
diff --git a/src/preferences.c b/src/preferences.c
index 8c6804f0..e089e04c 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -379,7 +379,6 @@ static void config_window_apply(void)
 	options->image_overlay.background_blue = c_options->image_overlay.background_blue;
 	options->image_overlay.background_alpha = c_options->image_overlay.background_alpha;
 	options->update_on_time_change = c_options->update_on_time_change;
-	options->image.exif_proof_rotate_enable = c_options->image.exif_proof_rotate_enable;
 
 	options->duplicates_similarity_threshold = c_options->duplicates_similarity_threshold;
 	options->rot_invariant_sim = c_options->rot_invariant_sim;
@@ -2341,11 +2340,6 @@ static void config_tab_image(GtkWidget *notebook)
 
 	c_options->image.alpha_color_1 = options->image.alpha_color_1;
 	c_options->image.alpha_color_2 = options->image.alpha_color_2;
-
-	group = pref_group_new(vbox, FALSE, _("Convenience"), GTK_ORIENTATION_VERTICAL);
-
-	pref_checkbox_new_int(group, _("Auto rotate proofs using Exif information"),
-			      options->image.exif_proof_rotate_enable, &c_options->image.exif_proof_rotate_enable);
 }
 
 /* windows tab */
-- 
2.20.1