combine xmailer/xnewsreader header options into one, using generic term "user agent"

diff --git a/src/account.c b/src/account.c
index a5053e48e575f2b30dd170185d7ba5e2308396d6..2d70e6d7363954ac83ceb73ab174d648453218f9 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -948,7 +948,6 @@ static void account_clone(GtkWidget *widget, gpointer data)
        /* send */
        ACP_FASSIGN(gen_msgid);
        ACP_FASSIGN(gen_xmailer);
        /* send */
        ACP_FASSIGN(gen_msgid);
        ACP_FASSIGN(gen_xmailer);

-       ACP_FASSIGN(gen_xnewsreader);

        ACP_FASSIGN(add_customhdr);
        ACP_FASSIGN(use_smtp_auth);
        ACP_FASSIGN(smtp_auth_type);
        ACP_FASSIGN(add_customhdr);
        ACP_FASSIGN(use_smtp_auth);
        ACP_FASSIGN(smtp_auth_type);

diff --git a/src/compose.c b/src/compose.c
index a3a6cf8acca69ee4ec69ca39d836d867dc263a8a..d9593c0a1c9093b7baed8caa591cc8851e1ce1d4 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6453,7 +6453,7 @@ static gchar *compose_get_header(Compose *compose)
                        gtk_major_version, gtk_minor_version, gtk_micro_version,
                        TARGET_ALIAS);
        }
                        gtk_major_version, gtk_minor_version, gtk_micro_version,
                        TARGET_ALIAS);
        }

-       if (compose->account->gen_xnewsreader &&
+       if (compose->account->gen_xmailer &&

            g_slist_length(compose->newsgroup_list) && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
                g_string_append_printf(header, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
                        prog_version,
            g_slist_length(compose->newsgroup_list) && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
                g_string_append_printf(header, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
                        prog_version,

diff --git a/src/prefs_account.c b/src/prefs_account.c
index c5f8ab98b98f8cc814075a07d1d3ddb05f480164..f9232cd11c4441b6c86722c1c00f725e684c9e5d 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -168,7 +168,6 @@ typedef struct SendPage
 
        GtkWidget *msgid_checkbtn;
        GtkWidget *xmailer_checkbtn;
 
        GtkWidget *msgid_checkbtn;
        GtkWidget *xmailer_checkbtn;

-       GtkWidget *xnewsreader_checkbtn;

        GtkWidget *customhdr_checkbtn;
        GtkWidget *msgid_with_addr_checkbtn;
        GtkWidget *smtp_auth_checkbtn;
        GtkWidget *customhdr_checkbtn;
        GtkWidget *msgid_with_addr_checkbtn;
        GtkWidget *smtp_auth_checkbtn;


@@ -515,10 +514,6 @@ static PrefParam send_param[] = {
         &send_page.xmailer_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
         &send_page.xmailer_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 

-       {"generate_xnewsreader", "TRUE", &tmp_ac_prefs.gen_xnewsreader, P_BOOL,
-        &send_page.xnewsreader_checkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-

        {"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
         &send_page.customhdr_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
         &send_page.customhdr_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},


@@ -1671,7 +1666,6 @@ static void send_create_widget_func(PrefsPage * _page,
        GtkWidget *frame;
        GtkWidget *msgid_checkbtn;
        GtkWidget *xmailer_checkbtn;
        GtkWidget *frame;
        GtkWidget *msgid_checkbtn;
        GtkWidget *xmailer_checkbtn;

-       GtkWidget *xnewsreader_checkbtn;

        GtkWidget *hbox;
        GtkWidget *customhdr_checkbtn;
        GtkWidget *customhdr_edit_btn;
        GtkWidget *hbox;
        GtkWidget *customhdr_checkbtn;
        GtkWidget *customhdr_edit_btn;


@@ -1704,10 +1698,7 @@ static void send_create_widget_func(PrefsPage * _page,
                           _("Send account mail address in Message-ID"));
 
        PACK_CHECK_BUTTON (vbox2, xmailer_checkbtn,
                           _("Send account mail address in Message-ID"));
 
        PACK_CHECK_BUTTON (vbox2, xmailer_checkbtn,

-                          _("Generate X-Mailer header"));
-
-       PACK_CHECK_BUTTON (vbox2, xnewsreader_checkbtn,
-                          _("Generate X-Newsreader header"));
+                          _("Add user agent header"));

 
        hbox = gtk_hbox_new (FALSE, 12);
        gtk_widget_show (hbox);
 
        hbox = gtk_hbox_new (FALSE, 12);
        gtk_widget_show (hbox);


@@ -1854,7 +1845,6 @@ static void send_create_widget_func(PrefsPage * _page,
        
        page->msgid_checkbtn     = msgid_checkbtn;
        page->xmailer_checkbtn   = xmailer_checkbtn;
        
        page->msgid_checkbtn     = msgid_checkbtn;
        page->xmailer_checkbtn   = xmailer_checkbtn;

-       page->xnewsreader_checkbtn   = xnewsreader_checkbtn;

        page->customhdr_checkbtn = customhdr_checkbtn;
        page->msgid_with_addr_checkbtn  = checkbtn_msgid_with_addr;
 
        page->customhdr_checkbtn = customhdr_checkbtn;
        page->msgid_with_addr_checkbtn  = checkbtn_msgid_with_addr;
 


@@ -3957,13 +3947,8 @@ 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_hide(send_page.msgid_checkbtn);
                } else
                        gtk_widget_show(send_page.msgid_checkbtn);

-               if (protocol == A_NNTP) {
-                       gtk_widget_hide(send_page.xmailer_checkbtn);
-                       gtk_widget_show(send_page.xnewsreader_checkbtn);
-               } else {
-                       gtk_widget_show(send_page.xmailer_checkbtn);
-                       gtk_widget_hide(send_page.xnewsreader_checkbtn);                        
-               }
+
+               gtk_widget_show(send_page.xmailer_checkbtn);

        }
 }
 
        }
 }
 


@@ -4112,8 +4097,7 @@ 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_hide(protocol_optmenu->no_imap_warn_label);
 #endif
                gtk_widget_show(send_page.msgid_checkbtn);

-               gtk_widget_hide(send_page.xmailer_checkbtn);
-               gtk_widget_show(send_page.xnewsreader_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),
                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),


@@ -4214,7 +4198,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
        case A_LOCAL:
                gtk_widget_show(send_page.msgid_checkbtn);
                gtk_widget_show(send_page.xmailer_checkbtn);
        case A_LOCAL:
                gtk_widget_show(send_page.msgid_checkbtn);
                gtk_widget_show(send_page.xmailer_checkbtn);

-               gtk_widget_hide(send_page.xnewsreader_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);
                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);


@@ -4321,7 +4304,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                TRUE);
                gtk_widget_hide(send_page.msgid_checkbtn);
                gtk_widget_show(send_page.xmailer_checkbtn);
                                TRUE);
                gtk_widget_hide(send_page.msgid_checkbtn);
                gtk_widget_show(send_page.xmailer_checkbtn);

-               gtk_widget_hide(send_page.xnewsreader_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),
                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),


@@ -4421,7 +4403,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
        case A_NONE:
                gtk_widget_show(send_page.msgid_checkbtn);
                gtk_widget_show(send_page.xmailer_checkbtn);
        case A_NONE:
                gtk_widget_show(send_page.msgid_checkbtn);
                gtk_widget_show(send_page.xmailer_checkbtn);

-               gtk_widget_hide(send_page.xnewsreader_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);
                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);


@@ -4519,7 +4500,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
        default:
                gtk_widget_show(send_page.msgid_checkbtn);
                gtk_widget_show(send_page.xmailer_checkbtn);
        default:
                gtk_widget_show(send_page.msgid_checkbtn);
                gtk_widget_show(send_page.xmailer_checkbtn);

-               gtk_widget_hide(send_page.xnewsreader_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);
                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);

diff --git a/src/prefs_account.h b/src/prefs_account.h
index 6bc27a9205f9367025cc898bb71a144717a5311d..40b930161eebb3813799daa533a80c5c763b6e00 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -110,7 +110,6 @@ struct _PrefsAccount
        /* Send */
        gboolean gen_msgid;
        gboolean gen_xmailer;
        /* Send */
        gboolean gen_msgid;
        gboolean gen_xmailer;

-       gboolean gen_xnewsreader;

        gboolean add_customhdr;
        gboolean use_smtp_auth;
        SMTPAuthType smtp_auth_type;
        gboolean add_customhdr;
        gboolean use_smtp_auth;
        SMTPAuthType smtp_auth_type;