2011-02-10 [paul] 3.7.8cvs50

	* src/prefs_account.c
		move the 'send acc mail addr in msg-id" option to
		the send page

diff --git a/ChangeLog b/ChangeLog
index eca59505b6a1e5ed3c12a9f54ab5368340fd19b3..1d256bcbcdb1ce9afbf47150703b120bb46c4717 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-10 [paul]      3.7.8cvs50
+
+       * src/prefs_account.c
+               move the 'send acc mail addr in msg-id" option to
+               the send page
+
 2011-02-10 [paul]      3.7.8cvs49
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index 3168b7e50df51012e5183a5c812f6bc506f9b68b..2a65cc58bee7b54b811e79fe879fe5da7665d57d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4123,3 +4123,4 @@
 ( cvs diff -u -r 1.75.2.67 -r 1.75.2.68 src/matcher.c;  cvs diff -u -r 1.49.2.137 -r 1.49.2.138 src/procmime.c;  cvs diff -u -r 1.17.2.24 -r 1.17.2.25 src/procmime.h;  cvs diff -u -r 1.15.2.59 -r 1.15.2.60 src/summary_search.c;  cvs diff -u -r 1.36.2.189 -r 1.36.2.190 src/common/utils.c;  cvs diff -u -r 1.20.2.74 -r 1.20.2.75 src/common/utils.h;  ) > 3.7.8cvs47.patchset
 ( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 manual/advanced.xml;  cvs diff -u -r 1.213.2.198 -r 1.213.2.199 src/folder.c;  cvs diff -u -r 1.83.2.164 -r 1.83.2.165 src/mimeview.c;  cvs diff -u -r 1.204.2.200 -r 1.204.2.201 src/prefs_common.c;  cvs diff -u -r 1.103.2.131 -r 1.103.2.132 src/prefs_common.h;  ) > 3.7.8cvs48.patchset
 ( cvs diff -u -r 1.105.2.162 -r 1.105.2.163 src/prefs_account.c;  ) > 3.7.8cvs49.patchset
+( cvs diff -u -r 1.105.2.163 -r 1.105.2.164 src/prefs_account.c;  ) > 3.7.8cvs50.patchset

diff --git a/configure.ac b/configure.ac
index 650f6d3f72c2e1c6facecc847a2728bb0bdd3b83..51df04a7c029767bf287049e703a64e4677a98d6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 81b35188a95eaffdff212b54fee72b9855642a4f..1c62cbe5ad80903e61ea9c8e2f31605625e66d49 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -163,6 +163,7 @@ typedef struct SendPage
 
        GtkWidget *msgid_checkbtn;
        GtkWidget *customhdr_checkbtn;
+       GtkWidget *msgid_with_addr_checkbtn;
        GtkWidget *smtp_auth_checkbtn;
        GtkWidget *smtp_auth_type_optmenu;
        GtkWidget *smtp_uid_entry;
@@ -281,7 +282,6 @@ typedef struct AdvancedPage
        GtkWidget *nntpport_spinbtn;
        GtkWidget *domain_checkbtn;
        GtkWidget *domain_entry;
-       GtkWidget *msgid_with_addr_checkbtn;
        GtkWidget *crosspost_checkbtn;
        GtkWidget *crosspost_colormenu;
 
@@ -504,7 +504,11 @@ static PrefParam send_param[] = {
         &send_page.customhdr_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
+       {"msgid_with_addr", "FALSE", &tmp_ac_prefs.msgid_with_addr, P_BOOL,
+        &send_page.msgid_with_addr_checkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
+        {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
         &send_page.smtp_auth_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
@@ -791,9 +795,6 @@ static PrefParam advanced_param[] = {
         &advanced_page.domain_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 
-       {"msgid_with_addr", "FALSE", &tmp_ac_prefs.msgid_with_addr, P_BOOL,
-        &advanced_page.msgid_with_addr_checkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
 #ifndef G_OS_WIN32
        {"set_tunnelcmd", "FALSE", &tmp_ac_prefs.set_tunnelcmd, P_BOOL,
         &advanced_page.tunnelcmd_checkbtn,
@@ -1649,6 +1650,7 @@ static void send_create_widget_func(PrefsPage * _page,
        GtkWidget *hbox;
        GtkWidget *customhdr_checkbtn;
        GtkWidget *customhdr_edit_btn;
+       GtkWidget *checkbtn_msgid_with_addr;
        GtkWidget *vbox3;
        GtkWidget *smtp_auth_checkbtn;
        GtkWidget *optmenu;
@@ -1673,6 +1675,9 @@ static void send_create_widget_func(PrefsPage * _page,
 
        PACK_CHECK_BUTTON (vbox2, msgid_checkbtn, _("Generate Message-ID"));
 
+       PACK_CHECK_BUTTON (vbox2, checkbtn_msgid_with_addr,
+                          _("Send account mail address in Message-ID"));
+
        hbox = gtk_hbox_new (FALSE, 12);
        gtk_widget_show (hbox);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
@@ -1822,6 +1827,7 @@ static void send_create_widget_func(PrefsPage * _page,
        
        page->msgid_checkbtn     = msgid_checkbtn;
        page->customhdr_checkbtn = customhdr_checkbtn;
+       page->msgid_with_addr_checkbtn  = checkbtn_msgid_with_addr;
 
        page->smtp_auth_checkbtn       = smtp_auth_checkbtn;
        page->smtp_auth_type_optmenu = optmenu;
@@ -2588,7 +2594,6 @@ static void advanced_create_widget_func(PrefsPage * _page,
        GtkWidget *checkbtn_domain;
        GtkWidget *entry_domain;
        gchar *tip_domain;
-       GtkWidget *checkbtn_msgid_with_addr;
        GtkWidget *checkbtn_crosspost;
        GtkWidget *colormenu_crosspost;
        GtkWidget *menu;
@@ -2674,9 +2679,6 @@ static void advanced_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (hbox1), entry_domain, TRUE, TRUE, 0);
        SET_TOGGLE_SENSITIVITY (checkbtn_domain, entry_domain);
        CLAWS_SET_TIP(entry_domain, tip_domain);
-       PACK_HBOX (hbox1);
-       PACK_CHECK_BUTTON (hbox1, checkbtn_msgid_with_addr,
-                          _("Send account mail address in Message-ID"));
 
 #ifndef G_OS_WIN32     
        PACK_HBOX (hbox1);
@@ -2771,7 +2773,6 @@ static void advanced_create_widget_func(PrefsPage * _page,
        page->nntpport_spinbtn          = spinbtn_nntpport;
        page->domain_checkbtn           = checkbtn_domain;
        page->domain_entry              = entry_domain;
-       page->msgid_with_addr_checkbtn  = checkbtn_msgid_with_addr;
        page->crosspost_checkbtn        = checkbtn_crosspost;
        page->crosspost_colormenu       = colormenu_crosspost;