Remove e_shell_hide_widgets_for_express_mode().

No longer needed.

2 files changed, 0 insertions, 32 deletions

diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index 48c50e3500..7e1f458b8d 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -925,31 +925,6 @@ calendar_preferences_construct (ECalendarPreferences *prefs,
 	e_datetime_format_add_setup_widget (table, 0, "calendar", "table",  DTFormatKindDateTime, _("Ti_me and date:"));
 	e_datetime_format_add_setup_widget (table, 1, "calendar", "table",  DTFormatKindDate, _("_Date only:"));
 
-	/* Hide senseless preferences when running in Express mode */
-	e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
-					       "label_second_zone",
-					       "hbox_second_zone",
-					       "timezone",
-					       "timezone_label",
-					       "hbox_use_system_timezone",
-					       "hbox_time_divisions",
-					       "show_end_times",
-					       "month_scroll_by_week",
-					       NULL);
-
-	/* HACK: GTK+ 2.18 and 2.20 has a GtkTable which includes
-	 *       row/column spacing even for empty rows/columns.
-	 *       When Evo runs in Express mode, we hide all the rows in
-	 *       the Time section of the calendar's General preferences
-	 *       page.  However, due to that behavior in GTK+, we get a
-	 *       lot of extra spacing in that section.  Since we know that
-	 *       in Express mode we only leave a single row visible, we'll
-	 *       make the table's row spacing equal to 0 in that case. */
-	if (e_shell_get_express_mode (shell)) {
-		widget = e_builder_get_widget (prefs->builder, "time");
-		gtk_table_set_row_spacings (GTK_TABLE (widget), 0);
-	}
-
 	/* Hook up and add the toplevel widget */
 
 	target = e_cal_config_target_new_prefs (ec);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 7d80bbcb1c..a2e1628299 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -503,13 +503,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 			widget, "prefer-html",
 			G_SETTINGS_BIND_GET);
 
-	/* Sanitize the dialog for Express mode */
-	e_shell_hide_widgets_for_express_mode (
-		shell, prefs->builder,
-		"chkOutlookFilenames",
-		"chkTopSignature",
-		NULL);
-
 	/* get our toplevel widget */
 	target = em_config_target_new_prefs (ec);
 	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);