diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/e-composer-actions.c | 8 | ||||
| -rw-r--r-- | composer/e-composer-header-table.c | 26 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 5 |
3 files changed, 3 insertions, 36 deletions
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index d085a3a751..8388888234 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -116,12 +116,8 @@ action_preferences_cb (GtkAction *action, GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_present (GTK_WINDOW (preferences_window)); - if (e_shell_get_express_mode (shell)) - e_preferences_window_filter_page ( - E_PREFERENCES_WINDOW (preferences_window), page_name); - else - e_preferences_window_show_page ( - E_PREFERENCES_WINDOW (preferences_window), page_name); + e_preferences_window_show_page ( + E_PREFERENCES_WINDOW (preferences_window), page_name); } static void 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: diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index f2208d7e9d..76aa82eacb 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1950,11 +1950,6 @@ msg_composer_constructed (GObject *object) shell = e_msg_composer_get_shell (composer); - if (e_shell_get_express_mode (shell)) { - GtkWindow *parent = e_shell_get_active_window (shell); - gtk_window_set_transient_for (GTK_WINDOW (composer), parent); - } - e_composer_private_constructed (composer); web_view = e_msg_composer_get_web_view (composer); |