2005-04-17 [colin] 1.9.6cvs40
authorColin Leroy <colin@colino.net>
Sun, 17 Apr 2005 17:20:50 +0000 (17:20 +0000)
committerColin Leroy <colin@colino.net>
Sun, 17 Apr 2005 17:20:50 +0000 (17:20 +0000)
* src/compose.c
Fix 'Request return receipt' from folder
properties (bug #708)

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/compose.c

index 75e08de..7abe1e6 100644 (file)
@@ -1,3 +1,9 @@
+2005-04-17 [colin]     1.9.6cvs40
+
+       * src/compose.c
+               Fix 'Request return receipt' from folder
+               properties (bug #708)
+
 2005-04-17 [colin]     1.9.6cvs39
 
        * src/mainwindow.c
index b2949b5..3dc3c3d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.395.2.66 -r 1.395.2.67 src/summaryview.c; ) > 1.9.6cvs37.patchset
 ( cvs diff -u -r 1.207.2.31 -r 1.207.2.32 src/folderview.c; ) > 1.9.6cvs38.patchset
 ( cvs diff -u -r 1.274.2.33 -r 1.274.2.34 src/mainwindow.c; ) > 1.9.6cvs39.patchset
+( cvs diff -u -r 1.382.2.117 -r 1.382.2.118 src/compose.c; ) > 1.9.6cvs40.patchset
index 8cb1a72..eda2319 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index a5705cb..da0c793 100644 (file)
@@ -775,7 +775,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
                        compose_entry_mark_default_to(compose, item->prefs->default_to);
                }
                if (item && item->ret_rcpt) {
-                       menu_set_active(ifactory, "/Message/Request Return Receipt", TRUE);
+                       menu_set_active(ifactory, "/Options/Request Return Receipt", TRUE);
                }
        } else {
                if (mailto) {
@@ -785,7 +785,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
                 * CLAWS: just don't allow return receipt request, even if the user
                 * may want to send an email. simple but foolproof.
                 */
-               menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE); 
+               menu_set_sensitive(ifactory, "/Options/Request Return Receipt", FALSE); 
        }
        compose_add_field_list( compose, listAddress );
 
@@ -992,7 +992,7 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
                compose->replyinfo = procmsg_msginfo_copy(msginfo);
 
        if (msginfo->folder && msginfo->folder->ret_rcpt)
-               menu_set_active(ifactory, "/Message/Request Return Receipt", TRUE);
+               menu_set_active(ifactory, "/Options/Request Return Receipt", TRUE);
 
        /* Set save folder */
        if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {