From 018018fabe7e660f7928b8a7b817bb63202dc734 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 31 Mar 2013 11:47:17 -0400 Subject: Remove more Express Mode hacks. This removes all traces of Express Mode from all but the contact editor and calendar appointment editor. Need to evaluate the remaining cases individually. --- composer/e-composer-header-table.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'composer/e-composer-header-table.c') diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 43b9c9d787..35ac6c9903 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -269,30 +269,6 @@ skip_custom: return new_destinations; } -static gboolean -from_header_should_be_visible (EComposerHeaderTable *table) -{ - EShell *shell; - EComposerHeader *header; - EComposerHeaderType type; - GtkComboBox *combo_box; - GtkTreeModel *tree_model; - - shell = e_composer_header_table_get_shell (table); - - /* Always display From in standard mode. */ - if (!e_shell_get_express_mode (shell)) - return TRUE; - - type = E_COMPOSER_HEADER_FROM; - header = e_composer_header_table_get_header (table, type); - - combo_box = GTK_COMBO_BOX (header->input_widget); - tree_model = gtk_combo_box_get_model (combo_box); - - return (gtk_tree_model_iter_n_children (tree_model, NULL) > 1); -} - static void composer_header_table_setup_mail_headers (EComposerHeaderTable *table) { @@ -333,7 +309,7 @@ composer_header_table_setup_mail_headers (EComposerHeaderTable *table) switch (ii) { case E_COMPOSER_HEADER_FROM: sensitive = TRUE; - visible = from_header_should_be_visible (table); + visible = TRUE; break; case E_COMPOSER_HEADER_BCC: -- cgit v1.2.3