set request return receipt when replying if it is set is the folder prefs of the...
authorChristoph Hohmann <reboot@gmx.ch>
Thu, 23 Aug 2001 22:50:42 +0000 (22:50 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Thu, 23 Aug 2001 22:50:42 +0000 (22:50 +0000)
disable final error popup if popups are disabled in config (again)

ChangeLog.claws
src/compose.c
src/inc.c

index b6e8994..339e192 100644 (file)
@@ -1,3 +1,13 @@
+2001-08-24 [christoph]
+
+       * src/compose.c
+               set request return receipt when replying
+               if it is set is the folder prefs of the
+               message
+       * src/inc.c
+               disable final error popup if popups are
+               disabled in config (again)
+
 2001-08-23 [paul]
 
        * configure.in
index 2a72431..aef20d2 100644 (file)
@@ -619,6 +619,13 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
                compose->use_to = TRUE;
        }
 
+       if(msginfo->folder && msginfo->folder->prefs->request_return_receipt) {
+               GtkItemFactory *ifactory;
+       
+               ifactory = gtk_item_factory_from_widget(compose->menubar);
+               menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+       }
+
        if (compose_parse_header(compose, msginfo) < 0) return;
        compose_reply_set_entry(compose, msginfo, to_all, ignore_replyto,
                                followup_and_reply_to);
index c43fa79..610e333 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -537,7 +537,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
 
        /* gtk_label_set_text(GTK_LABEL(inc_dialog->mainwin->statuslabel), "");  */
 
-       if (error_num) {
+       if (error_num && !prefs_common.noerrorpanel) {
                if (inc_dialog->show_dialog)
                        manage_window_focus_in(inc_dialog->dialog->window,
                                               NULL, NULL);