Remove uninteresting mail options from Preferences.

Remove some options from Mail Preferences that aren't worth the screen
real estate they take up.  For now, the corresponding GConf keys still
remain and are honored by Evolution.  These same options were already
removed for Express mode.

Options removed are:

[ ] Mark messages as read after XXX seconds

[ ] Do not display messages when text size exceeds XXX KB

[ ] Shrink To / Cc / Bcc headers to XXX addresses

[ ] Enable Magic Spacebar

[ ] Enable Search Folders

1 files changed, 0 insertions, 92 deletions

diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index ecc794ebf6..944c007007 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -131,34 +131,6 @@ em_mailer_prefs_init (EMMailerPrefs *preferences)
 	preferences->gconf = mail_config_get_gconf_client ();
 }
 
-static gboolean
-mark_seen_timeout_transform (const GValue *src_value,
-                             GValue *dst_value,
-                             gpointer user_data)
-{
-	gdouble v_double;
-
-	/* Shell Settings (gint) -> Spin Button (double) */
-	v_double = (gdouble) g_value_get_int (src_value);
-	g_value_set_double (dst_value, v_double / 1000.0);
-
-	return TRUE;
-}
-
-static gboolean
-mark_seen_timeout_reverse_transform (const GValue *src_value,
-                                     GValue *dst_value,
-                                     gpointer user_data)
-{
-	gdouble v_double;
-
-	/* Spin Button (double) -> Shell Settings (gint) */
-	v_double = g_value_get_double (src_value);
-	g_value_set_int (dst_value, v_double * 1000);
-
-	return TRUE;
-}
-
 enum {
 	JH_LIST_COLUMN_NAME,
 	JH_LIST_COLUMN_VALUE
@@ -847,56 +819,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	/* General tab */
 
 	/* Message Display */
-	widget = e_builder_get_widget (prefs->builder, "chkMarkTimeout");
-	e_mutual_binding_new (
-		shell_settings, "mail-mark-seen",
-		widget, "active");
-
-	/* The "mark seen" timeout requires special transform functions
-	 * because we display the timeout value to the user in seconds
-	 * but store the settings value in milliseconds. */
-	widget = e_builder_get_widget (prefs->builder, "spinMarkTimeout");
-	prefs->timeout = GTK_SPIN_BUTTON (widget);
-	e_mutual_binding_new (
-		shell_settings, "mail-mark-seen",
-		widget, "sensitive");
-	e_mutual_binding_new_full (
-		shell_settings, "mail-mark-seen-timeout",
-		widget, "value",
-		mark_seen_timeout_transform,
-		mark_seen_timeout_reverse_transform,
-		NULL, NULL);
-
-	widget = e_builder_get_widget (prefs->builder, "mlimit_checkbutton");
-	e_mutual_binding_new (
-		shell_settings, "mail-force-message-limit",
-		widget, "active");
-
-	widget = e_builder_get_widget (prefs->builder, "mlimit_spin");
-	e_mutual_binding_new (
-		shell_settings, "mail-force-message-limit",
-		widget, "sensitive");
-	e_mutual_binding_new (
-		shell_settings, "mail-message-text-part-limit",
-		widget, "value");
-
-	widget = e_builder_get_widget (prefs->builder, "address_checkbox");
-	e_mutual_binding_new (
-		shell_settings, "mail-address-compress",
-		widget, "active");
-
-	widget = e_builder_get_widget (prefs->builder, "address_spin");
-	e_mutual_binding_new (
-		shell_settings, "mail-address-compress",
-		widget, "sensitive");
-	e_mutual_binding_new (
-		shell_settings, "mail-address-count",
-		widget, "value");
-
-	widget = e_builder_get_widget (prefs->builder, "magic_spacebar_checkbox");
-	e_mutual_binding_new (
-		shell_settings, "mail-magic-spacebar",
-		widget, "active");
 
 	widget = e_builder_get_widget (prefs->builder, "view-check");
 	e_mutual_binding_new (
@@ -927,11 +849,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 		e_binding_transform_color_to_string,
 		NULL, NULL);
 
-	widget = e_builder_get_widget (prefs->builder, "chkEnableSearchFolders");
-	e_mutual_binding_new (
-		shell_settings, "mail-enable-search-folders",
-		widget, "active");
-
 	/* Deleting Mail */
 	widget = e_builder_get_widget (prefs->builder, "chkEmptyTrashOnExit");
 	e_mutual_binding_new (
@@ -1196,15 +1113,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	g_signal_connect (G_OBJECT (prefs->junk_header_add), "clicked", G_CALLBACK (jh_add_cb), prefs);
 	g_signal_connect (G_OBJECT (prefs->junk_header_remove), "clicked", G_CALLBACK (jh_remove_cb), prefs);
 
-	/* Sanitize the dialog for Express mode */
-	e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
-					       "hboxReadTimeout",
-					       "hboxMailSizeLimit",
-					       "hboxShrinkAddresses",
-					       "magic_spacebar_checkbox",
-					       "hboxEnableSearchFolders",
-					       NULL);
-
 	/* get our toplevel widget */
 	target = em_config_target_new_prefs (ec, prefs->gconf);
 	e_config_set_target ((EConfig *)ec, (EConfigTarget *)target);