From fc87135cf92ccb5172a55a02863a8c2473a34b8e Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 29 Aug 2011 17:39:09 +0200 Subject: [PATCH] Do not suppress the 'Generate X-Mailer' option for new IMAP accounts While at it, remove redundant gtk_widget_show() calls. The option is enabled by default. --- src/prefs_account.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git src/prefs_account.c src/prefs_account.c index 7f53ecb..5a4621b 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -3921,8 +3921,6 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam) gtk_widget_hide(send_page.msgid_checkbtn); } else gtk_widget_show(send_page.msgid_checkbtn); - - gtk_widget_show(send_page.xmailer_checkbtn); } } @@ -4071,7 +4069,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data) gtk_widget_hide(protocol_optmenu->no_imap_warn_label); #endif gtk_widget_show(send_page.msgid_checkbtn); - gtk_widget_show(send_page.xmailer_checkbtn); gtk_widget_show(basic_page.nntpserv_label); gtk_widget_show(basic_page.nntpserv_entry); gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table), @@ -4169,7 +4166,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data) break; case A_LOCAL: gtk_widget_show(send_page.msgid_checkbtn); - gtk_widget_show(send_page.xmailer_checkbtn); gtk_widget_hide(protocol_optmenu->no_imap_warn_icon); gtk_widget_hide(protocol_optmenu->no_imap_warn_label); gtk_widget_hide(basic_page.nntpserv_label); @@ -4273,11 +4269,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data) GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn), TRUE); gtk_widget_hide(send_page.msgid_checkbtn); - if (new_account) - gtk_toggle_button_set_active( - GTK_TOGGLE_BUTTON(send_page.xmailer_checkbtn), - TRUE); - gtk_widget_hide(send_page.xmailer_checkbtn); gtk_widget_hide(basic_page.nntpserv_label); gtk_widget_hide(basic_page.nntpserv_entry); gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table), @@ -4374,7 +4365,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data) break; case A_NONE: gtk_widget_show(send_page.msgid_checkbtn); - gtk_widget_show(send_page.xmailer_checkbtn); gtk_widget_hide(protocol_optmenu->no_imap_warn_icon); gtk_widget_hide(protocol_optmenu->no_imap_warn_label); gtk_widget_hide(basic_page.nntpserv_label); @@ -4469,7 +4459,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data) case A_POP3: default: gtk_widget_show(send_page.msgid_checkbtn); - gtk_widget_show(send_page.xmailer_checkbtn); gtk_widget_hide(protocol_optmenu->no_imap_warn_icon); gtk_widget_hide(protocol_optmenu->no_imap_warn_label); gtk_widget_hide(basic_page.nntpserv_label); -- 1.7.6