remove External Program settings from Common Prefs/Send

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f0264deae116afefb2939e38971a5eb9b4b3219b..95a1778019f9e6e355d2c3e094b7e7057aaf5a40 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2003-09-27 [paul]      0.9.5claws33
+
+       * src/prefs_common.[ch]
+         src/procmsg.c
+         src/send_message.c
+               remove External Program settings from Common Prefs/Send
+               as they are now unnecessary due to Local account settings.
+               plus a little tidying-up after 0.9.5claws31
+

 2003-09-27 [paul]      0.9.5claws32
 
        * src/prefs_account.c
 2003-09-27 [paul]      0.9.5claws32
 
        * src/prefs_account.c

diff --git a/configure.ac b/configure.ac
index ef1356065886dcbd0c5fd9c0da47d5523cb97770..bf7874497c35fcd9c8bfda7f0c0da1626279dec6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=32
+EXTRA_VERSION=33

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 37ea047a219dc722218155d8f854946e7abfd15d..759208cbaea10aa83aeec730ccf477df6904f328 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -66,10 +66,6 @@ static struct Receive {
        GtkWidget *entry_incext;
        GtkWidget *button_incext;
 
        GtkWidget *entry_incext;
        GtkWidget *button_incext;
 

-       GtkWidget *checkbtn_local;
-       GtkWidget *checkbtn_filter_on_inc;
-       GtkWidget *entry_spool;
-

        GtkWidget *checkbtn_autochk;
        GtkWidget *spinbtn_autochk;
        GtkObject *spinbtn_autochk_adj;
        GtkWidget *checkbtn_autochk;
        GtkWidget *spinbtn_autochk;
        GtkObject *spinbtn_autochk_adj;


@@ -88,10 +84,6 @@ static struct Receive {
 } receive;
 
 static struct Send {
 } receive;
 
 static struct Send {

-       GtkWidget *checkbtn_extsend;
-       GtkWidget *entry_extsend;
-       GtkWidget *button_extsend;
-

        GtkWidget *checkbtn_savemsg;
        GtkWidget *checkbtn_queuemsg;
        GtkWidget *optmenu_senddialog;
        GtkWidget *checkbtn_savemsg;
        GtkWidget *checkbtn_queuemsg;
        GtkWidget *optmenu_senddialog;


@@ -308,12 +300,6 @@ static PrefParam param[] = {
         prefs_set_data_from_toggle, prefs_set_toggle},
  
        /* Send */
         prefs_set_data_from_toggle, prefs_set_toggle},
  
        /* Send */

-       {"use_ext_sendmail", "FALSE", &prefs_common.use_extsend, P_BOOL,
-        &p_send.checkbtn_extsend,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"ext_sendmail_cmd", DEFAULT_SENDMAIL_CMD,
-        &prefs_common.extsend_cmd, P_STRING,
-        &p_send.entry_extsend, prefs_set_data_from_entry, prefs_set_entry},

        {"save_message", "TRUE", &prefs_common.savemsg, P_BOOL,
         &p_send.checkbtn_savemsg,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"save_message", "TRUE", &prefs_common.savemsg, P_BOOL,
         &p_send.checkbtn_savemsg,
         prefs_set_data_from_toggle, prefs_set_toggle},


@@ -1042,12 +1028,6 @@ static void prefs_receive_create(void)
        GtkWidget *entry_incext;
        /* GtkWidget *button_incext; */
 
        GtkWidget *entry_incext;
        /* GtkWidget *button_incext; */
 

-       GtkWidget *frame_spool;
-       GtkWidget *checkbtn_local;
-       GtkWidget *checkbtn_filter_on_inc;
-       GtkWidget *label_spool;
-       GtkWidget *entry_spool;
-

        GtkWidget *hbox_autochk;
        GtkWidget *checkbtn_autochk;
        GtkWidget *label_autochk1;
        GtkWidget *hbox_autochk;
        GtkWidget *checkbtn_autochk;
        GtkWidget *label_autochk1;


@@ -1243,13 +1223,7 @@ static void prefs_send_create(void)
 {
        GtkWidget *vbox1;
        GtkWidget *vbox2;
 {
        GtkWidget *vbox1;
        GtkWidget *vbox2;

-       GtkWidget *frame_extsend;
-       GtkWidget *vbox_extsend;
-       GtkWidget *checkbtn_extsend;

        GtkWidget *hbox1;
        GtkWidget *hbox1;

-       GtkWidget *label_extsend;
-       GtkWidget *entry_extsend;
-       /* GtkWidget *button_extsend; */

        GtkWidget *checkbtn_savemsg;
        GtkWidget *checkbtn_queuemsg;
        GtkWidget *label_outcharset;
        GtkWidget *checkbtn_savemsg;
        GtkWidget *checkbtn_queuemsg;
        GtkWidget *label_outcharset;


@@ -1270,35 +1244,6 @@ static void prefs_send_create(void)
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 

-       PACK_FRAME(vbox1, frame_extsend, _("External program"));
-
-       vbox_extsend = gtk_vbox_new (FALSE, VSPACING_NARROW);
-       gtk_widget_show (vbox_extsend);
-       gtk_container_add (GTK_CONTAINER (frame_extsend), vbox_extsend);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox_extsend), 8);
-
-       PACK_CHECK_BUTTON (vbox_extsend, checkbtn_extsend,
-                          _("Use external program for sending"));
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox_extsend), hbox1, FALSE, FALSE, 0);
-       SET_TOGGLE_SENSITIVITY(checkbtn_extsend, hbox1);
-
-       label_extsend = gtk_label_new (_("Command"));
-       gtk_widget_show (label_extsend);
-       gtk_box_pack_start (GTK_BOX (hbox1), label_extsend, FALSE, FALSE, 0);
-
-       entry_extsend = gtk_entry_new ();
-       gtk_widget_show (entry_extsend);
-       gtk_box_pack_start (GTK_BOX (hbox1), entry_extsend, TRUE, TRUE, 0);
-
-#if 0
-       button_extsend = gtk_button_new_with_label ("... ");
-       gtk_widget_show (button_extsend);
-       gtk_box_pack_start (GTK_BOX (hbox1), button_extsend, FALSE, FALSE, 0);
-#endif
-

        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);


@@ -1309,7 +1254,6 @@ static void prefs_send_create(void)
                           _("Queue messages that fail to send"));
 
        hbox_senddialog = gtk_hbox_new (FALSE, 8);
                           _("Queue messages that fail to send"));
 
        hbox_senddialog = gtk_hbox_new (FALSE, 8);

-       gtk_widget_show (hbox1);

        gtk_box_pack_start (GTK_BOX (vbox1), hbox_senddialog, FALSE, FALSE, 0);
 
        label_senddialog = gtk_label_new (_("Show send dialog"));
        gtk_box_pack_start (GTK_BOX (vbox1), hbox_senddialog, FALSE, FALSE, 0);
 
        label_senddialog = gtk_label_new (_("Show send dialog"));


@@ -1425,10 +1369,6 @@ static void prefs_send_create(void)
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 

-       p_send.checkbtn_extsend = checkbtn_extsend;
-       p_send.entry_extsend    = entry_extsend;
-       /* p_send.button_extsend   = button_extsend; */
-

        p_send.checkbtn_savemsg  = checkbtn_savemsg;
        p_send.checkbtn_queuemsg = checkbtn_queuemsg;
        p_send.optmenu_senddialog = optmenu_senddialog;
        p_send.checkbtn_savemsg  = checkbtn_savemsg;
        p_send.checkbtn_queuemsg = checkbtn_queuemsg;
        p_send.optmenu_senddialog = optmenu_senddialog;

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 2fdddd8387fd5f2b61ad7d46a39021193aa984ba..a3aa3495f1a8c9cdd4248bdb30c09cde843a3a03 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -76,8 +76,6 @@ struct _PrefsCommon
        gboolean no_recv_err_panel;
 
        /* Send */
        gboolean no_recv_err_panel;
 
        /* Send */

-       gboolean use_extsend;
-       gchar *extsend_cmd;

        gboolean savemsg;
        gboolean queue_msg;
        SendDialogMode send_dialog_mode;
        gboolean savemsg;
        gboolean queue_msg;
        SendDialogMode send_dialog_mode;

diff --git a/src/procmsg.c b/src/procmsg.c
index 6ebbb546127be612a53b16d5d987c2f34cc2429a..ddca1e3703ae0a3a87f413cc17b78268b97a4dbb 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1162,9 +1162,6 @@ gint procmsg_send_message_queue(const gchar *file)
                           mailac->mail_command && (* mailac->mail_command)) {
                        mailval = send_message_local(mailac->mail_command, fp);
                        local = 1;
                           mailac->mail_command && (* mailac->mail_command)) {
                        mailval = send_message_local(mailac->mail_command, fp);
                        local = 1;

-               } else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
-                       mailval = send_message_local(prefs_common.extsend_cmd, fp);
-                       local = 1;

                } else {
                        if (!mailac) {
                                mailac = account_find_from_smtp_server(from, smtpserver);
                } else {
                        if (!mailac) {
                                mailac = account_find_from_smtp_server(from, smtpserver);

diff --git a/src/send_message.c b/src/send_message.c
index 09f8ab39deb8566dec3221acfcca2ac1579bba50..52b2726a57798dfbf992a841685dfdf65b0ab0c8 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -106,13 +106,7 @@ gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
                val = send_message_local(ac_prefs->mail_command, fp);
                fclose(fp);
                return val;
                val = send_message_local(ac_prefs->mail_command, fp);
                fclose(fp);
                return val;

-       }
-       else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
-               val = send_message_local(prefs_common.extsend_cmd, fp);
-               fclose(fp);
-               return val;
-       }
-       else {
+       } else {

                val = send_message_smtp(ac_prefs, to_list, fp);
                
                fclose(fp);
                val = send_message_smtp(ac_prefs, to_list, fp);
                
                fclose(fp);