[gthumb: 6/20] removed unused preferences

[Paolo Bacchilega <paobac src gnome org>]

commit 7a080ddcddb21a1d81832221642e7cccd6ce69d2
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Mar 28 16:22:47 2010 +0200

    removed unused preferences

 data/gthumb.schemas.in   |  146 ----------------------------------------------
 data/ui/preferences.ui   |   15 +++++-
 gthumb/gth-preferences.h |    4 -
 3 files changed, 14 insertions(+), 151 deletions(-)
---
diff --git a/data/gthumb.schemas.in b/data/gthumb.schemas.in
index 4338f54..06db504 100644
--- a/data/gthumb.schemas.in
+++ b/data/gthumb.schemas.in
@@ -43,59 +43,6 @@
       </schema>
 
       <schema>
-	<key>/schemas/apps/gthumb/general/max_history_length</key>
-	<applyto>/apps/gthumb/general/max_history_length</applyto>
-	<owner>gthumb</owner>
-	<type>int</type>
-	<default>15</default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-	<key>/schemas/apps/gthumb/general/editors</key>
-	<applyto>/apps/gthumb/general/editors</applyto>
-	<owner>gthumb</owner>
-	<type>list</type>
-	<list_type>string</list_type>
-	<default>[]</default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-	<key>/schemas/apps/gthumb/general/migrate_directories</key>
-	<applyto>/apps/gthumb/general/migrate_directories</applyto>
-	<owner>gthumb</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-	<key>/schemas/apps/gthumb/general/migrate_comment_system</key>
-	<applyto>/apps/gthumb/general/migrate_comment_system</applyto>
-	<owner>gthumb</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
 	<key>/schemas/apps/gthumb/general/active_extensions</key>
 	<applyto>/apps/gthumb/general/active_extensions</applyto>
 	<owner>gthumb</owner>
@@ -505,99 +452,6 @@
 	</locale>
       </schema>
 
-      <!-- Importer -->
-
-      <schema>
-	<key>/schemas/apps/gthumb/importer/destination</key>
-	<applyto>/apps/gthumb/importer/destination</applyto>
-	<owner>gthumb</owner>
-	<type>string</type>
-	<default></default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-	<key>/schemas/apps/gthumb/importer/subfolder_type</key>
-	<applyto>/apps/gthumb/importer/subfolder_type</applyto>
-	<owner>gthumb</owner>
-	<type>string</type>
-	<default>none</default>
-	<locale name="C">
-	  <short></short>
-	  <long>Possible values are: none, file_date, current_date
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-	<key>/schemas/apps/gthumb/importer/subfolder_format</key>
-	<applyto>/apps/gthumb/importer/subfolder_format</applyto>
-	<owner>gthumb</owner>
-	<type>string</type>
-	<default>yyyymmdd</default>
-	<locale name="C">
-	  <short></short>
-	  <long>Possible values are: yyyymmdd, yyyymm, yyyy
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gthumb/importer/subfolder_single</key>
-        <applyto>/apps/gthumb/importer/subfolder_single</applyto>
-        <owner>gthumb</owner>
-        <type>bool</type>
-        <default>FALSE</default>
-        <locale name="C">
-          <short></short>
-          <long>
-          </long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gthumb/importer/subfolder_custom_format</key>
-        <applyto>/apps/gthumb/importer/subfolder_custom_format</applyto>
-        <owner>gthumb</owner>
-        <type>string</type>
-        <default></default>
-        <locale name="C">
-          <short></short>
-          <long>
-          </long>
-        </locale>
-      </schema>
-
-      <schema>
-	<key>/schemas/apps/gthumb/importer/overwrite_files</key>
-	<applyto>/apps/gthumb/importer/overwrite_files</applyto>
-	<owner>gthumb</owner>
-	<type>bool</type>
-	<default>FALSE</default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-	<key>/schemas/apps/gthumb/importer/adjust_orientation</key>
-	<applyto>/apps/gthumb/importer/adjust_orientation</applyto>
-	<owner>gthumb</owner>
-	<type>bool</type>
-	<default>FALSE</default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
       <!-- Messages -->
 
       <schema>
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index c1f8ba8..ed42356 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -189,8 +189,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>
@@ -310,6 +310,19 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="embed_metadata_checkbutton">
+                                <property name="label" translatable="yes">_Store metadata inside files if possible</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="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
diff --git a/gthumb/gth-preferences.h b/gthumb/gth-preferences.h
index d602f65..7f82cbf 100644
--- a/gthumb/gth-preferences.h
+++ b/gthumb/gth-preferences.h
@@ -34,10 +34,6 @@ G_BEGIN_DECLS
 #define PREF_GO_TO_LAST_LOCATION            "/apps/gthumb/general/go_to_last_location"
 #define PREF_USE_STARTUP_LOCATION           "/apps/gthumb/general/use_startup_location"
 #define PREF_STARTUP_LOCATION               "/apps/gthumb/general/startup_location"
-#define PREF_MAX_HISTORY_LENGTH             "/apps/gthumb/general/max_history_length"
-#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_ACTIVE_EXTENSIONS              "/apps/gthumb/general/active_extensions"
 
 #define PREF_GENERAL_FILTER                 "/apps/gthumb/browser/general_filter"