Index: data/glade/gthumb_camera.glade
===================================================================
RCS file: /cvs/gnome/gthumb/data/glade/gthumb_camera.glade,v
retrieving revision 1.13
diff -u -r1.13 gthumb_camera.glade
--- data/glade/gthumb_camera.glade	18 Nov 2005 10:54:55 -0000	1.13
+++ data/glade/gthumb_camera.glade	7 Oct 2006 18:55:27 -0000
@@ -221,7 +221,7 @@
 	      <child>
 		<widget class="GtkTable" id="i_commands_table">
 		  <property name="visible">True</property>
-		  <property name="n_rows">5</property>
+		  <property name="n_rows">6</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">6</property>
@@ -444,6 +444,28 @@
 		      <property name="bottom_attach">1</property>
 		      <property name="x_options">fill</property>
 		      <property name="y_options">fill</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckButton" id="reset_exif_tag_on_import_checkbutton">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Reset photo orientation</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">5</property>
+		      <property name="bottom_attach">6</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
 		    </packing>
 		  </child>
 		</widget>
Index: data/glade/gthumb_preferences.glade
===================================================================
RCS file: /cvs/gnome/gthumb/data/glade/gthumb_preferences.glade,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 gthumb_preferences.glade
--- data/glade/gthumb_preferences.glade	6 Oct 2006 16:00:00 -0000	1.5.2.1
+++ data/glade/gthumb_preferences.glade	7 Oct 2006 18:55:28 -0000
@@ -18,6 +18,7 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -579,6 +580,7 @@
 				  <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
 				  <property name="local_only">True</property>
 				  <property name="show_hidden">False</property>
+				  <property name="do_overwrite_confirmation">False</property>
 				  <property name="width_chars">-1</property>
 				</widget>
 				<packing>
@@ -782,147 +784,6 @@
 		<packing>
 		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox62">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox122">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">5</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label189">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;To rotate images with Exif orientation tag support:&lt;/b&gt;</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox123">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label190">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox63">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radio_exif_use_orientation_tag">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Adjust orientation tag. Leave image data unchanged.</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radio_exif_use_image_transform">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Adjust image data. Reset orientation tag to top-left.</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">radio_exif_use_orientation_tag</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
Index: data/glade/gthumb_tools.glade
===================================================================
RCS file: /cvs/gnome/gthumb/data/glade/gthumb_tools.glade,v
retrieving revision 1.18.2.1
diff -u -r1.18.2.1 gthumb_tools.glade
--- data/glade/gthumb_tools.glade	6 Oct 2006 16:00:00 -0000	1.18.2.1
+++ data/glade/gthumb_tools.glade	7 Oct 2006 18:55:30 -0000
@@ -771,6 +771,26 @@
 		      </child>
 
 		      <child>
+			<widget class="GtkCheckButton" id="j_reset_exif_tag_on_rotate_checkbutton">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Reset photo orientation</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			  <property name="pack_type">GTK_PACK_END</property>
+			</packing>
+		      </child>
+
+		      <child>
 			<widget class="GtkCheckButton" id="j_apply_to_all_checkbutton">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
Index: libgthumb/preferences.h
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/preferences.h,v
retrieving revision 1.36.2.1
diff -u -r1.36.2.1 preferences.h
--- libgthumb/preferences.h	6 Oct 2006 16:00:01 -0000	1.36.2.1
+++ libgthumb/preferences.h	7 Oct 2006 18:55:30 -0000
@@ -43,7 +43,8 @@
 #define  PREF_EDITORS                "/apps/gthumb/general/editors"
 #define  PREF_MIGRATE_DIRECTORIES    "/apps/gthumb/general/migrate_directories"
 #define  PREF_MIGRATE_COMMENT_SYSTEM "/apps/gthumb/general/migrate_comment_system"
-#define  PREF_USE_EXIF_ORIENTATION   "/apps/gthumb/general/use_exif_orientation"
+#define  PREF_RESET_EXIF_ORIENTATION_IMPORT	"/apps/gthumb/general/reset_exif_orientation_on_import"
+#define  PREF_RESET_EXIF_ORIENTATION_ROTATE     "/apps/gthumb/general/reset_exif_orientation_on_rotate"
 
 #define  PREF_SHOW_HIDDEN_FILES      "/apps/gthumb/browser/show_hidden_files"
 #define  PREF_SHOW_FILENAMES         "/apps/gthumb/browser/show_filenames"
Index: src/dlg-jpegtran.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-jpegtran.c,v
retrieving revision 1.36.2.1
diff -u -r1.36.2.1 dlg-jpegtran.c
--- src/dlg-jpegtran.c	6 Oct 2006 16:00:02 -0000	1.36.2.1
+++ src/dlg-jpegtran.c	7 Oct 2006 18:55:30 -0000
@@ -70,6 +70,7 @@
 	GtkWidget    *j_revert_button;;
 	GtkWidget    *j_apply_to_all_checkbutton;
 	GtkWidget    *j_preview_image;
+	GtkWidget    *j_reset_exif_tag_on_rotate_checkbutton;
 
 	GList        *file_list;
 	GList        *files_changed_list;
@@ -258,7 +259,7 @@
 	gnome_vfs_get_file_info (path, &info, GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS|GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
 	if (image_is_jpeg (path)) {
 		apply_transformation_exif (window, path, data->rot_data);
-		if (!eel_gconf_get_boolean (PREF_USE_EXIF_ORIENTATION, TRUE)) {
+		if (eel_gconf_get_boolean (PREF_RESET_EXIF_ORIENTATION_ROTATE, TRUE)) {
 			update_rotation_from_exif_data (path, data->rot_data);
                         apply_transformation_jpeg (window, path, data->rot_data);
 		}
@@ -493,6 +494,14 @@
 }
 
 
+static void
+reset_exif_tag_on_rotate_clicked (GtkWidget  *button,
+		              DialogData *data)
+{
+	eel_gconf_set_boolean (PREF_RESET_EXIF_ORIENTATION_ROTATE,
+		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->j_reset_exif_tag_on_rotate_checkbutton)));
+}
+
 /* called when the "help" button is clicked. */
 static void
 help_cb (GtkWidget  *widget, 
@@ -585,6 +594,8 @@
 	j_v_flip_button = glade_xml_get_widget (data->gui, "j_v_flip_button");
 	j_h_flip_button = glade_xml_get_widget (data->gui, "j_h_flip_button");
 
+	data->j_reset_exif_tag_on_rotate_checkbutton = glade_xml_get_widget (data->gui, "j_reset_exif_tag_on_rotate_checkbutton");
+
 	j_help_button = glade_xml_get_widget (data->gui, "j_help_button");
 	j_cancel_button = glade_xml_get_widget (data->gui, "j_cancel_button");
 	j_ok_button = glade_xml_get_widget (data->gui, "j_ok_button");
@@ -602,6 +613,8 @@
 	gtk_widget_set_sensitive (data->j_apply_to_all_checkbutton,
 				  data->file_list->next != NULL);
 
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->j_reset_exif_tag_on_rotate_checkbutton), eel_gconf_get_boolean (PREF_RESET_EXIF_ORIENTATION_ROTATE, TRUE));
+
 	/* Set the signals handlers. */
 	
 	g_signal_connect (G_OBJECT (data->dialog),
@@ -641,6 +654,11 @@
 			  "clicked",
 			  G_CALLBACK (flip_clicked),
 			  data);
+        g_signal_connect (G_OBJECT (data->j_reset_exif_tag_on_rotate_checkbutton),
+ 			  "clicked",
+                          G_CALLBACK (reset_exif_tag_on_rotate_clicked),
+			  data);
+
 
 	data->loader = (ImageLoader*)image_loader_new (NULL, FALSE);
 
Index: src/dlg-photo-importer.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-photo-importer.c,v
retrieving revision 1.38.2.1
diff -u -r1.38.2.1 dlg-photo-importer.c
--- src/dlg-photo-importer.c	6 Oct 2006 16:00:02 -0000	1.38.2.1
+++ src/dlg-photo-importer.c	7 Oct 2006 18:55:31 -0000
@@ -95,6 +95,7 @@
 	GtkWidget      *import_delete_button;
 	GtkWidget      *import_ok_button;
 	GtkWidget      *i_commands_table;
+	GtkWidget      *reset_exif_tag_on_import_checkbutton;
 
 	GtkWidget      *progress_info_image;
 	GtkWidget      *progress_info_label;
@@ -524,6 +525,7 @@
 	gtk_widget_set_sensitive (data->import_reload_button, value);
 	gtk_widget_set_sensitive (data->import_delete_button, value);
 	gtk_widget_set_sensitive (data->i_commands_table, value);
+	gtk_widget_set_sensitive (data->reset_exif_tag_on_import_checkbutton, value);
 }
 
 
@@ -1486,8 +1488,7 @@
 
 	data->keep_original_filename = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->keep_names_checkbutton));
 	data->delete_from_camera = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->delete_checkbutton));
-	data->adjust_orientation = eel_gconf_get_boolean (PREF_PHOTO_IMPORT_ADJUST_ORIENTATION, TRUE)
-					&& !eel_gconf_get_boolean (PREF_USE_EXIF_ORIENTATION, TRUE);
+	data->adjust_orientation = eel_gconf_get_boolean (PREF_RESET_EXIF_ORIENTATION_IMPORT, TRUE);
 
 	eel_gconf_set_boolean (PREF_PHOTO_IMPORT_KEEP_FILENAMES, data->keep_original_filename);
 	eel_gconf_set_boolean (PREF_PHOTO_IMPORT_DELETE, data->delete_from_camera);
@@ -1635,6 +1636,15 @@
 
 
 static void
+reset_exif_tag_on_import_cb (GtkButton  *button,
+		                            DialogData *data)
+{
+	eel_gconf_set_boolean (PREF_RESET_EXIF_ORIENTATION_IMPORT, 
+		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->reset_exif_tag_on_import_checkbutton)));
+}
+
+
+static void
 import_reload_cb (GtkButton  *button, 
 		  DialogData *data)
 {
@@ -1847,6 +1857,7 @@
 	data->import_delete_button = glade_xml_get_widget (data->gui, "import_delete_button");
 	data->i_commands_table = glade_xml_get_widget (data->gui, "i_commands_table");
 	data->import_ok_button = glade_xml_get_widget (data->gui, "import_okbutton");
+        data->reset_exif_tag_on_import_checkbutton = glade_xml_get_widget (data->gui, "reset_exif_tag_on_import_checkbutton");
 	btn_cancel = glade_xml_get_widget (data->gui, "import_cancelbutton");
 
 	data->image_list = gth_image_list_new (THUMB_SIZE + THUMB_BORDER);
@@ -1881,6 +1892,7 @@
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->keep_names_checkbutton), eel_gconf_get_boolean (PREF_PHOTO_IMPORT_KEEP_FILENAMES, FALSE));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->delete_checkbutton), eel_gconf_get_boolean (PREF_PHOTO_IMPORT_DELETE, FALSE));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->reset_exif_tag_on_import_checkbutton), eel_gconf_get_boolean (PREF_RESET_EXIF_ORIENTATION_IMPORT, TRUE));
 
 	default_path = eel_gconf_get_path (PREF_PHOTO_IMPORT_DESTINATION, NULL);
 	if ((default_path == NULL) || (*default_path == 0))
@@ -1926,6 +1938,11 @@
 	g_signal_connect (G_OBJECT (data->import_delete_button),
 			  "clicked",
 			  G_CALLBACK (import_delete_cb),
+			  data);
+
+	g_signal_connect (G_OBJECT (data->reset_exif_tag_on_import_checkbutton),
+			  "clicked",
+			  G_CALLBACK (reset_exif_tag_on_import_cb),
 			  data);
 
 	/* run dialog. */
Index: src/dlg-preferences.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-preferences.c,v
retrieving revision 1.22.2.1
diff -u -r1.22.2.1 dlg-preferences.c
--- src/dlg-preferences.c	6 Oct 2006 16:00:02 -0000	1.22.2.1
+++ src/dlg-preferences.c	7 Oct 2006 18:55:31 -0000
@@ -256,13 +256,6 @@
 }
 
 static void
-exif_use_orientation_tag_toggled_cb (GtkToggleButton *button, 
-			DialogData      *data)
-{
-	eel_gconf_set_boolean (PREF_USE_EXIF_ORIENTATION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->radio_exif_use_orientation_tag)));
-}
-
-static void
 toolbar_style_changed_cb (GtkOptionMenu *option_menu,
 			  DialogData    *data)
 {
@@ -511,11 +504,6 @@
 
 	g_free (startup_location);
 
-	if (eel_gconf_get_boolean (PREF_USE_EXIF_ORIENTATION, TRUE))
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->radio_exif_use_orientation_tag), TRUE);
-	else 
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->radio_exif_use_image_transform), TRUE);
-
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_confirm_del), eel_gconf_get_boolean (PREF_CONFIRM_DELETION, TRUE));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_ask_to_save), eel_gconf_get_boolean (PREF_MSG_SAVE_MODIFIED_IMAGE, TRUE));
 
@@ -622,15 +610,6 @@
 	g_signal_connect (G_OBJECT (data->radio_layout4), 
 			  "toggled",
 			  G_CALLBACK (layout_toggled_cb),
-			  data);
-
-	g_signal_connect (G_OBJECT (data->radio_exif_use_orientation_tag), 
-			  "toggled",
-			  G_CALLBACK (exif_use_orientation_tag_toggled_cb),
-			  data);
-	g_signal_connect (G_OBJECT (data->radio_exif_use_image_transform), 
-			  "toggled",
-			  G_CALLBACK (exif_use_orientation_tag_toggled_cb),
 			  data);
 
 	g_signal_connect (G_OBJECT (data->toolbar_style_optionmenu), 
