2006-06-21 [paul] 2.3.1cvs5
authorPaul Mangan <paul@claws-mail.org>
Wed, 21 Jun 2006 08:48:25 +0000 (08:48 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 21 Jun 2006 08:48:25 +0000 (08:48 +0000)
* src/messageview.c
* src/prefs_common.c
* src/prefs_common.h
* src/prefs_other.c
add an option to 'Never send Return
Receipts'
Thanks to Colin

ChangeLog
PATCHSETS
configure.ac
src/messageview.c
src/prefs_common.c
src/prefs_common.h
src/prefs_other.c

index ccf71561f02b7fecd59bbad71d0f9b5c1c75e425..41d7b1b218a88e8f0f8d74cf5fd761b8993975d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-21 [paul]      2.3.1cvs5
+
+       * src/messageview.c
+       * src/prefs_common.c
+       * src/prefs_common.h
+       * src/prefs_other.c
+               add an option to 'Never send Return
+               Receipts'
+               Thanks to Colin
+
 2006-06-20 [mones]     2.3.1cvs4
 
        * po/es.po
index b8e6c547f79c272b7e07bcf611d6e99e15b094d7..da549f846b391d418a6331267cdeacd1f8fab2ac 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.17.2.22 -r 1.17.2.23 src/alertpanel.c;  cvs diff -u -r 1.96.2.117 -r 1.96.2.118 src/textview.c;  ) > 2.3.1cvs2.patchset
 ( cvs diff -u -r 1.101.2.25 -r 1.101.2.26 src/news.c;  cvs diff -u -r 1.47.2.31 -r 1.47.2.32 src/procheader.c;  cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/unmime.c;  ) > 2.3.1cvs3.patchset
 ( cvs diff -u -r 1.60.2.30 -r 1.60.2.31 po/es.po;  cvs diff -u -r 1.382.2.281 -r 1.382.2.282 src/compose.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/make.themes.project;  ) > 2.3.1cvs4.patchset
+( cvs diff -u -r 1.94.2.88 -r 1.94.2.89 src/messageview.c;  cvs diff -u -r 1.204.2.88 -r 1.204.2.89 src/prefs_common.c;  cvs diff -u -r 1.103.2.51 -r 1.103.2.52 src/prefs_common.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_other.c;  ) > 2.3.1cvs5.patchset
index bc252ccbc85b994ca3ff0e617d9a1807ed2de141..0317dcc932a0597fb59cea1fbc06798cd4f37ad8 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d7382ace923285eadaa45a13b4dc1b73b392b362..3eb71c3589f39290ecdd76ffd77ca213b8653786 100644 (file)
@@ -851,7 +851,8 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                                  messageview->msginfo);
        else if ((messageview->msginfo->dispositionnotificationto || 
             messageview->msginfo->returnreceiptto) &&
-           !MSG_IS_RETRCPT_SENT(messageview->msginfo->flags))
+           !MSG_IS_RETRCPT_SENT(messageview->msginfo->flags) &&
+           !prefs_common.never_send_retrcpt)
                return_receipt_show(messageview->noticeview, 
                                    messageview->msginfo);
        else 
index 42bd4fdf3a515e2dd8e8f7b4baa65976f78fe835..13ddcafa97441fb99fda723a8d3ae4ae0b1c280b 100644 (file)
@@ -555,6 +555,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"line_space", "2", &prefs_common.line_space, P_INT,
         NULL, NULL, NULL},
+       {"never_send_retrcpt", "FALSE", &prefs_common.never_send_retrcpt, P_BOOL,
+        NULL, NULL, NULL},
 
        {"enable_smooth_scroll", "FALSE",
         &prefs_common.enable_smooth_scroll, P_BOOL,
index f4dfd2695348e419674d2b2a3b85b56306e4f41a..d7cda7baf9ff7e0d048aeef313a02da6b78ffbbf 100644 (file)
@@ -375,6 +375,7 @@ struct _PrefsCommon
        gint broken_are_utf8;
        gint skip_ssl_cert_check;
        gint live_dangerously;
+       gint never_send_retrcpt;
 };
 
 extern PrefsCommon prefs_common;
index f6c98d83cd424dc912c34a8f2472aeeffcc16f02..5b7742c56c3fa41c428e736da2899cc93218237e 100644 (file)
@@ -56,6 +56,7 @@ typedef struct _OtherPage
         GtkWidget *checkbtn_cliplog;
        GtkWidget *spinbtn_loglength;
        GtkWidget *spinbtn_iotimeout;
+       GtkWidget *chkbtn_never_send_retrcpt;
 } OtherPage;
 
 void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window, 
@@ -90,6 +91,8 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *spinbtn_iotimeout;
        GtkObject *spinbtn_iotimeout_adj;
 
+       GtkWidget *chkbtn_never_send_retrcpt;
+
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
@@ -185,6 +188,9 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 
+       PACK_CHECK_BUTTON(vbox1, chkbtn_never_send_retrcpt,
+                         _("Never send Return Receipts"));
+
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_addaddrbyclick), 
                prefs_common.add_address_by_click);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_confonexit), 
@@ -197,6 +203,8 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
                prefs_common.warn_queued_on_exit);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_cliplog), 
                prefs_common.cliplog);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_never_send_retrcpt),
+               prefs_common.never_send_retrcpt);
        
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_loglength),
                prefs_common.loglength);
@@ -211,6 +219,7 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_other->checkbtn_cliplog = checkbtn_cliplog;
        prefs_other->spinbtn_loglength = spinbtn_loglength;
        prefs_other->spinbtn_iotimeout = spinbtn_iotimeout;
+       prefs_other->chkbtn_never_send_retrcpt = chkbtn_never_send_retrcpt;
 
        prefs_other->page.widget = vbox1;
 }
@@ -240,6 +249,8 @@ void prefs_other_save(PrefsPage *_page)
 #ifdef HAVE_LIBETPAN
        imap_main_set_timeout(prefs_common.io_timeout_secs);
 #endif
+       prefs_common.never_send_retrcpt = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->chkbtn_never_send_retrcpt));
        mainwindow = mainwindow_get_mainwindow();
        log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog,
                                prefs_common.loglength);