[gthumb] Removed the "do not change folder" option

[Paolo Bacchilega <paobac src gnome org>]

commit 0432fd4e062b25c24003bb1384b62c009df504b2
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Aug 16 12:24:44 2010 +0200

    Removed the "do not change folder" option
    
    This option is useless and hard to explain to a
    non-technical user.

 data/ui/preferences.ui   |   27 +++++----------------------
 gthumb/dlg-preferences.c |    6 ++----
 2 files changed, 7 insertions(+), 26 deletions(-)
---
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index 32c7690..6ed49dc 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -168,22 +168,6 @@
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkRadioButton" id="current_location_radiobutton">
-                                <property name="label" translatable="yes">Do _not change folder</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkRadioButton" id="go_to_last_location_radiobutton">
                                 <property name="label" translatable="yes">Go to last _visited location</property>
                                 <property name="visible">True</property>
@@ -191,12 +175,11 @@
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">current_location_radiobutton</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="position">1</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -211,7 +194,7 @@
                                     <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
-                                    <property name="group">current_location_radiobutton</property>
+                                    <property name="group">go_to_last_location_radiobutton</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -222,8 +205,8 @@
                                 <child>
                                   <object class="GtkFileChooserButton" id="startup_dir_filechooserbutton">
                                     <property name="visible">True</property>
-                                    <property name="action">select-folder</property>
                                     <property name="local_only">False</property>
+                                    <property name="action">select-folder</property>
                                     <property name="title" translatable="yes">Choose startup folder</property>
                                   </object>
                                   <packing>
@@ -234,7 +217,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="position">2</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
@@ -258,7 +241,7 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="position">3</property>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                           </object>
diff --git a/gthumb/dlg-preferences.c b/gthumb/dlg-preferences.c
index c3fc126..bc77796 100644
--- a/gthumb/dlg-preferences.c
+++ b/gthumb/dlg-preferences.c
@@ -253,12 +253,10 @@ dlg_preferences (GthBrowser *browser)
 
 	if (eel_gconf_get_boolean (PREF_USE_STARTUP_LOCATION, FALSE))
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("use_startup_location_radiobutton")), TRUE);
-	else if (eel_gconf_get_boolean (PREF_GO_TO_LAST_LOCATION, TRUE))
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("go_to_last_location_radiobutton")), TRUE);
 	else
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("current_location_radiobutton")), TRUE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("go_to_last_location_radiobutton")), TRUE);
 
-	if (! eel_gconf_get_boolean (PREF_USE_STARTUP_LOCATION, FALSE)) {
+	if (! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("use_startup_location_radiobutton")))) {
 		gtk_widget_set_sensitive (GET_WIDGET ("startup_dir_filechooserbutton"), FALSE);
 		gtk_widget_set_sensitive (GET_WIDGET ("set_to_current_button"), FALSE);
 	}