don't allow return receipts when composing a news article

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 035f4b19f81dff1a30ba09f8950108d861371ff5..d996c53d885a865d741254e4e8389cb15e31f0b9 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-06-25 [alfons]    0.7.8claws26
+
+       * src/compose.c
+               don't allow return receipts when composing a news article
+
 2002-06-25 [paul]      0.7.8claws25
 
        * Makefile.am

diff --git a/configure.in b/configure.in
index 2728c654537f8ed9625da372e375bd5363b4d15c..870da77de4f5510f35942e86f3ed70b7a1c31428 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws26
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 07bdb5cbd7ea9f483e63bd8391cd5fe692addced..226a40a66a4efa188c10edf0a1f7dd38bfe21f71 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -743,6 +743,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
 {
        Compose *compose;
        GtkSText *text;
+       GtkItemFactory *ifactory;
        gboolean grab_focus_on_last = TRUE;
 
        if (item && item->prefs && item->prefs->enable_default_account)
@@ -752,6 +753,8 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        g_return_val_if_fail(account != NULL, NULL);
 
        compose = compose_create(account, COMPOSE_NEW);
+       ifactory = gtk_item_factory_from_widget(compose->menubar);
+
        compose->replyinfo = NULL;
 
        text = GTK_STEXT(compose->text);
@@ -768,6 +771,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        gtk_widget_grab_focus(compose->text);
        gtkut_widget_wait_for_draw(compose->text);
 
+
        if (account->protocol != A_NNTP) {
                if (mailto) {
                        compose_entries_set(compose, mailto);
@@ -778,15 +782,17 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
                        grab_focus_on_last = FALSE;
                }
                if (item && item->ret_rcpt) {
-                       GtkItemFactory *ifactory;
-               
-                       ifactory = gtk_item_factory_from_widget(compose->menubar);
                        menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
                }
        } else {
                if (mailto) {
                        compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
                }
+               /*
+                * 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); 
        }
        compose_show_first_last_header(compose, TRUE);