Index: data/gthumb.schemas.in
===================================================================
RCS file: /cvs/gnome/gthumb/data/gthumb.schemas.in,v
retrieving revision 1.21
diff -u -p -r1.21 gthumb.schemas.in
--- data/gthumb.schemas.in	8 Oct 2006 08:45:27 -0000	1.21
+++ data/gthumb.schemas.in	9 Oct 2006 09:01:28 -0000
@@ -95,19 +95,6 @@
 	</locale>
       </schema>
 
-      <schema>
-	<key>/schemas/apps/gthumb/general/use_exif_orientation</key>
-	<applyto>/apps/gthumb/general/use_exif_orientation</applyto>
-	<owner>gthumb</owner>
-	<type>bool</type>
-	<default>false</default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
       <!-- Browser -->
 
       <schema>
@@ -1828,8 +1815,23 @@
       </schema>
 
       <schema>
-	<key>/schemas/apps/gthumb/dialogs/photo_importer/adjust_orientation</key>
-	<applyto>/apps/gthumb/dialogs/photo_importer/adjust_orientation</applyto>
+	<key>/schemas/apps/gthumb/dialogs/photo_importer/keep_photo_orientation</key>
+	<applyto>/apps/gthumb/dialogs/photo_importer/keep_photo_orientation</applyto>
+	<owner>gthumb</owner>
+	<type>bool</type>
+	<default>TRUE</default>
+	<locale name="C">
+	  <short></short>
+	  <long> 
+	  </long>
+	</locale>
+      </schema>
+
+      <!-- Rotate Dialog -->
+
+      <schema>
+	<key>/schemas/apps/gthumb/dialogs/rotate/adjust_photo_orientation</key>
+	<applyto>/apps/gthumb/dialogs/rotate/adjust_photo_orientation</applyto>
 	<owner>gthumb</owner>
 	<type>bool</type>
 	<default>TRUE</default>
Index: data/glade/gthumb_camera.glade
===================================================================
RCS file: /cvs/gnome/gthumb/data/glade/gthumb_camera.glade,v
retrieving revision 1.14
diff -u -p -r1.14 gthumb_camera.glade
--- data/glade/gthumb_camera.glade	8 Oct 2006 08:45:23 -0000	1.14
+++ data/glade/gthumb_camera.glade	9 Oct 2006 09:01:28 -0000
@@ -448,10 +448,10 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckButton" id="reset_exif_tag_on_import_checkbutton">
+		    <widget class="GtkCheckButton" id="keep_photo_orientation_checkbutton">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Reset photo orientation</property>
+		      <property name="label" translatable="yes">Keep photo orientation</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
Index: data/glade/gthumb_tools.glade
===================================================================
RCS file: /cvs/gnome/gthumb/data/glade/gthumb_tools.glade,v
retrieving revision 1.19
diff -u -p -r1.19 gthumb_tools.glade
--- data/glade/gthumb_tools.glade	8 Oct 2006 08:45:23 -0000	1.19
+++ data/glade/gthumb_tools.glade	9 Oct 2006 09:01:31 -0000
@@ -771,10 +771,10 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkCheckButton" id="j_reset_exif_tag_on_rotate_checkbutton">
+			<widget class="GtkCheckButton" id="j_adjust_photo_orientation_checkbutton">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Reset photo orientation</property>
+			  <property name="label" translatable="yes">Adjust photo orientation</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
Index: libgthumb/preferences.h
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/preferences.h,v
retrieving revision 1.37
diff -u -p -r1.37 preferences.h
--- libgthumb/preferences.h	8 Oct 2006 08:45:27 -0000	1.37
+++ libgthumb/preferences.h	9 Oct 2006 09:01:32 -0000
@@ -197,9 +197,11 @@
 #define  PREF_PHOTO_IMPORT_FILM           "/apps/gthumb/dialogs/photo_importer/film"
 #define  PREF_PHOTO_IMPORT_DELETE         "/apps/gthumb/dialogs/photo_importer/delete_from_camera"
 #define  PREF_PHOTO_IMPORT_KEEP_FILENAMES "/apps/gthumb/dialogs/photo_importer/keep_original_filenames"
-#define  PREF_PHOTO_IMPORT_ADJUST_ORIENTATION "/apps/gthumb/dialogs/photo_importer/adjust_orientation"
+#define  PREF_PHOTO_IMPORT_KEEP_ORIENTATION "/apps/gthumb/dialogs/photo_importer/keep_photo_orientation"
 #define  PREF_PHOTO_IMPORT_MODEL          "/apps/gthumb/dialogs/photo_importer/model"
 #define  PREF_PHOTO_IMPORT_PORT           "/apps/gthumb/dialogs/photo_importer/port"
+
+#define  PREF_ROTATE_ADJUST_ORIENTATION "/apps/gthumb/dialogs/rotate/adjust_photo_orientation"
 
 #define  PREF_CROP_ASPECT_RATIO           "/apps/gthumb/dialogs/crop/aspect_ratio"
 #define  PREF_CROP_ASPECT_RATIO_WIDTH     "/apps/gthumb/dialogs/crop/aspect_ratio_width"
Index: src/dlg-jpegtran.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-jpegtran.c,v
retrieving revision 1.37
diff -u -p -r1.37 dlg-jpegtran.c
--- src/dlg-jpegtran.c	8 Oct 2006 08:45:17 -0000	1.37
+++ src/dlg-jpegtran.c	9 Oct 2006 09:01:32 -0000
@@ -68,7 +68,7 @@ typedef struct {
 	GtkWidget    *j_revert_button;;
 	GtkWidget    *j_apply_to_all_checkbutton;
 	GtkWidget    *j_preview_image;
-	GtkWidget    *j_reset_exif_tag_on_rotate_checkbutton;
+	GtkWidget    *j_adjust_photo_orientation_checkbutton;
 
 	GList        *file_list;
 	GList        *files_changed_list;
@@ -257,7 +257,7 @@ apply_transformation (DialogData *data,
 	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_RESET_EXIF_ORIENTATION_ROTATE, TRUE)) {
+		if (!eel_gconf_get_boolean (PREF_ROTATE_ADJUST_ORIENTATION, TRUE)) {
 			update_rotation_from_exif_data (path, data->rot_data);
                         apply_transformation_jpeg (window, path, data->rot_data);
 		}
@@ -493,11 +493,11 @@ flip_clicked (GtkWidget  *button, 
 
 
 static void
-reset_exif_tag_on_rotate_clicked (GtkWidget  *button,
+adjust_photo_orientation_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)));
+	eel_gconf_set_boolean (PREF_ROTATE_ADJUST_ORIENTATION,
+		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->j_adjust_photo_orientation_checkbutton)));
 }
 
 /* called when the "help" button is clicked. */
@@ -584,6 +584,7 @@ dlg_jpegtran (GthWindow *window)
 	data->j_button_vbox = glade_xml_get_widget (data->gui, "j_button_vbox");
 	data->j_revert_button = glade_xml_get_widget (data->gui, "j_revert_button");
 	data->j_preview_image = glade_xml_get_widget (data->gui, "j_preview_image");
+	data->j_adjust_photo_orientation_checkbutton = glade_xml_get_widget (data->gui, "j_adjust_photo_orientation_checkbutton");
 
 	j_image_vbox = glade_xml_get_widget (data->gui, "j_image_vbox");
 	j_revert_button = glade_xml_get_widget (data->gui, "j_revert_button");
@@ -592,8 +593,6 @@ dlg_jpegtran (GthWindow *window)
 	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");
@@ -611,7 +610,7 @@ dlg_jpegtran (GthWindow *window)
 	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));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->j_adjust_photo_orientation_checkbutton), eel_gconf_get_boolean (PREF_ROTATE_ADJUST_ORIENTATION, TRUE));
 
 	/* Set the signals handlers. */
 	
@@ -652,9 +651,9 @@ dlg_jpegtran (GthWindow *window)
 			  "clicked",
 			  G_CALLBACK (flip_clicked),
 			  data);
-        g_signal_connect (G_OBJECT (data->j_reset_exif_tag_on_rotate_checkbutton),
+   g_signal_connect (G_OBJECT (data->j_adjust_photo_orientation_checkbutton),
  			  "clicked",
-                          G_CALLBACK (reset_exif_tag_on_rotate_clicked),
+           G_CALLBACK (adjust_photo_orientation_clicked),
 			  data);
 
 
Index: src/dlg-photo-importer.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-photo-importer.c,v
retrieving revision 1.39
diff -u -p -r1.39 dlg-photo-importer.c
--- src/dlg-photo-importer.c	8 Oct 2006 08:45:17 -0000	1.39
+++ src/dlg-photo-importer.c	9 Oct 2006 09:01:33 -0000
@@ -95,7 +95,7 @@ typedef struct {
 	GtkWidget      *import_delete_button;
 	GtkWidget      *import_ok_button;
 	GtkWidget      *i_commands_table;
-	GtkWidget      *reset_exif_tag_on_import_checkbutton;
+	GtkWidget      *keep_photo_orientation_checkbutton;
 
 	GtkWidget      *progress_info_image;
 	GtkWidget      *progress_info_label;
@@ -525,7 +525,7 @@ main_dialog_set_sensitive (DialogData *d
 	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);
+	gtk_widget_set_sensitive (data->keep_photo_orientation_checkbutton, value);
 }
 
 
@@ -1488,7 +1488,7 @@ ok_clicked_cb (GtkButton  *button,
 
 	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_RESET_EXIF_ORIENTATION_IMPORT, TRUE);
+	data->adjust_orientation = !eel_gconf_get_boolean (PREF_PHOTO_IMPORT_KEEP_ORIENTATION, 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);
@@ -1636,11 +1636,11 @@ choose_categories_cb (GtkButton  *button
 
 
 static void
-reset_exif_tag_on_import_cb (GtkButton  *button,
+keep_photo_orientation_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)));
+	eel_gconf_set_boolean (PREF_PHOTO_IMPORT_KEEP_ORIENTATION, 
+		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->keep_photo_orientation_checkbutton)));
 }
 
 
@@ -1857,7 +1857,7 @@ dlg_photo_importer (GthBrowser *browser)
 	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");
+   data->keep_photo_orientation_checkbutton = glade_xml_get_widget (data->gui, "keep_photo_orientation_checkbutton");
 	btn_cancel = glade_xml_get_widget (data->gui, "import_cancelbutton");
 
 	data->image_list = gth_image_list_new (THUMB_SIZE + THUMB_BORDER);
@@ -1892,7 +1892,7 @@ dlg_photo_importer (GthBrowser *browser)
 
 	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));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->keep_photo_orientation_checkbutton), eel_gconf_get_boolean (PREF_PHOTO_IMPORT_KEEP_ORIENTATION, TRUE));
 
 	default_path = eel_gconf_get_path (PREF_PHOTO_IMPORT_DESTINATION, NULL);
 	if ((default_path == NULL) || (*default_path == 0))
@@ -1940,9 +1940,9 @@ dlg_photo_importer (GthBrowser *browser)
 			  G_CALLBACK (import_delete_cb),
 			  data);
 
-	g_signal_connect (G_OBJECT (data->reset_exif_tag_on_import_checkbutton),
+	g_signal_connect (G_OBJECT (data->keep_photo_orientation_checkbutton),
 			  "clicked",
-			  G_CALLBACK (reset_exif_tag_on_import_cb),
+			  G_CALLBACK (keep_photo_orientation_cb),
 			  data);
 
 	/* run dialog. */
