[gthumb] webalbums: always use subfolders

[Paolo Bacchilega <paobac src gnome org>]

commit c89bcc1792de3d8082c7e673af490a321af12cbd
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Jul 7 00:13:42 2011 +0200

    webalbums: always use subfolders
    
    removed the relative option from the dialog
    
    [bug #624334]

 .../webalbums/data/gthumb_webalbums.schemas.in     |   13 -------------
 extensions/webalbums/data/ui/web-album-exporter.ui |   17 -----------------
 extensions/webalbums/dlg-web-exporter.c            |    3 ---
 extensions/webalbums/preferences.h                 |    1 -
 4 files changed, 0 insertions(+), 34 deletions(-)
---
diff --git a/extensions/webalbums/data/gthumb_webalbums.schemas.in b/extensions/webalbums/data/gthumb_webalbums.schemas.in
index 5264f82..f0bd3ea 100644
--- a/extensions/webalbums/data/gthumb_webalbums.schemas.in
+++ b/extensions/webalbums/data/gthumb_webalbums.schemas.in
@@ -106,19 +106,6 @@
       </schema>
 
       <schema>
-	<key>/schemas/apps/gthumb/ext/webalbums/use_subfolders</key>
-	<applyto>/apps/gthumb/ext/webalbums/use_subfolders</applyto>
-	<owner>gthumb</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
 	<key>/schemas/apps/gthumb/ext/webalbums/copy_images</key>
 	<applyto>/apps/gthumb/ext/webalbums/copy_images</applyto>
 	<owner>gthumb</owner>
diff --git a/extensions/webalbums/data/ui/web-album-exporter.ui b/extensions/webalbums/data/ui/web-album-exporter.ui
index de9b6ad..e82fa17 100644
--- a/extensions/webalbums/data/ui/web-album-exporter.ui
+++ b/extensions/webalbums/data/ui/web-album-exporter.ui
@@ -445,23 +445,6 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="use_subfolders_checkbutton">
-                                <property name="label" translatable="yes">Use subfolders to organize files</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkCheckButton" id="copy_images_checkbutton">
                                 <property name="label" translatable="yes">_Copy originals to destination</property>
                                 <property name="visible">True</property>
diff --git a/extensions/webalbums/dlg-web-exporter.c b/extensions/webalbums/dlg-web-exporter.c
index f791b39..9721aab 100644
--- a/extensions/webalbums/dlg-web-exporter.c
+++ b/extensions/webalbums/dlg-web-exporter.c
@@ -111,7 +111,6 @@ ok_clicked_cb (GtkWidget  *widget,
 	eel_gconf_set_path (PREF_WEBALBUMS_DESTINATION, s_value);
 	g_free (s_value);
 
-	eel_gconf_set_boolean (PREF_WEBALBUMS_USE_SUBFOLDERS, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("use_subfolders_checkbutton"))));
 	eel_gconf_set_boolean (PREF_WEBALBUMS_COPY_IMAGES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("copy_images_checkbutton"))));
 	eel_gconf_set_boolean (PREF_WEBALBUMS_RESIZE_IMAGES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_images_checkbutton"))));
 
@@ -192,7 +191,6 @@ ok_clicked_cb (GtkWidget  *widget,
 	gth_web_exporter_set_image_page_footer (GTH_WEB_EXPORTER (task), image_page_footer);
 	gth_web_exporter_set_style (GTH_WEB_EXPORTER (task), theme_name);
 	gth_web_exporter_set_destination (GTH_WEB_EXPORTER (task), destination);
-	gth_web_exporter_set_use_subfolders (GTH_WEB_EXPORTER (task), eel_gconf_get_boolean (PREF_WEBALBUMS_USE_SUBFOLDERS, TRUE));
 	gth_web_exporter_set_copy_images (GTH_WEB_EXPORTER (task), eel_gconf_get_boolean (PREF_WEBALBUMS_COPY_IMAGES, FALSE));
 	gth_web_exporter_set_resize_images (GTH_WEB_EXPORTER (task),
 					    eel_gconf_get_boolean (PREF_WEBALBUMS_RESIZE_IMAGES, FALSE),
@@ -407,7 +405,6 @@ dlg_web_exporter (GthBrowser *browser,
 
 	/* Set widgets data. */
 
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("use_subfolders_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_USE_SUBFOLDERS, TRUE));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("copy_images_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_COPY_IMAGES, FALSE));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_images_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_RESIZE_IMAGES, FALSE));
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton")), eel_gconf_get_integer (PREF_WEBALBUMS_IMAGES_PER_INDEX, 12));
diff --git a/extensions/webalbums/preferences.h b/extensions/webalbums/preferences.h
index 86be4c0..61a0d49 100644
--- a/extensions/webalbums/preferences.h
+++ b/extensions/webalbums/preferences.h
@@ -34,7 +34,6 @@ G_BEGIN_DECLS
 #define PREF_WEBALBUMS_DIR_HTML_INDEXES         "/apps/gthumb/ext/webalbums/directories/html_indexes"
 #define PREF_WEBALBUMS_DIR_THEME_FILES          "/apps/gthumb/ext/webalbums/directories/theme_files"
 #define PREF_WEBALBUMS_DESTINATION              "/apps/gthumb/ext/webalbums/destination"
-#define PREF_WEBALBUMS_USE_SUBFOLDERS           "/apps/gthumb/ext/webalbums/use_subfolders"
 #define PREF_WEBALBUMS_COPY_IMAGES              "/apps/gthumb/ext/webalbums/copy_images"
 #define PREF_WEBALBUMS_RESIZE_IMAGES            "/apps/gthumb/ext/webalbums/resize_images"
 #define PREF_WEBALBUMS_RESIZE_WIDTH             "/apps/gthumb/ext/webalbums/resize_width"