sync with sylpheed 0.6.4cvs6
authorPaul Mangan <paul@claws-mail.org>
Tue, 30 Oct 2001 10:25:49 +0000 (10:25 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 30 Oct 2001 10:25:49 +0000 (10:25 +0000)
12 files changed:
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/account.c
src/main.c
src/prefs_account.c
src/prefs_account.h
src/prefs_common.c
src/prefs_summary_column.c
src/procheader.c
src/summaryview.c

index e474d50..9eb88d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,46 @@
+2001-10-30
+
+       * src/procheader.c: procheader_parse(): fixed a bug that didn't
+         parse multiple message-id in In-Reply-To: header correctly
+         (thanks to KAJIWARA).
+
+2001-10-29
+
+       * src/account.c: enabled 'Get all' setting by clicking the 'G'
+         column of account list, and added some description.
+       * src/prefs_common.c: prefs_send_create(): added a description
+         for outgoing codeset.
+
+2001-10-28
+
+       * src/prefs_account.[ch]: moved inbox entry to the receive tab,
+         and added select button and short description.
+       * src/Makefile.am: added SYSCONFDIR to CPPFLAGS.
+       * src/procmime.c:
+         procmime_get_mime_type_table()
+         procmime_get_mime_type_list(): modified so that
+         $(SYSCONFDIR)/mime.types (or /etc/mime.types if not found) and
+         $(HOME)/.sylpheed/mime.types are read.
+
+2001-10-27
+
+       * src/prefs_account.c: moved the address auto-setting to the compose
+         tab.
+         prefs_account_create(): removed gtk_widget_show_all() for proper
+         window size.
+       * src/prefs_common.c: changed "Program path" to "Command".
+
 2001-10-26
 
        * src/textview.c: textview_set_font(): support Russian charset
          on EUC-JP locale.
        * src/summaryview.c: summary_delete(): (hopefully) fixed the crash
          bug on deleting.
+       * prefs_account.c
+         prefs_common.c
+         prefs_summary_column.c: minor improvements to the English.
+       * src/main.c: get_queued_message_num(): don't output the warning
+         when queueing folder is not found.
 
 2001-10-21
 
index fbc5472..94c94f8 100644 (file)
@@ -1,3 +1,8 @@
+2001-10-30 [paul]      0.6.4claws16
+
+               * sync with sylpheed 0.6.4cvs6
+                       see ChangeLog entries 2001-10-26 to 2001-10-30
+
 2001-10-29 [paul]      0.6.4claws15
 
        * src/html.c, src/textview.c
index d9bc4bc..d86e404 100644 (file)
@@ -1,9 +1,45 @@
+2001-10-30
+
+       * src/procheader.c: procheader_parse(): In-Reply-To: ¥Ø¥Ã¥À¤Î
+         Ê£¿ô¤Î¥á¥Ã¥»¡¼¥¸ ID ¤òÀµ¤·¤¯¥Ñ¡¼¥¹¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¥Ð¥°¤ò½¤Àµ
+         (³á¸¶¤µ¤ó thanks)¡£
+
+2001-10-29
+
+       * src/account.c: ¥¢¥«¥¦¥ó¥È°ìÍ÷¤Î 'G' ¥«¥é¥à¤Î¥¯¥ê¥Ã¥¯¤Ë¤è¤ë
+         ¡ÖÁ´¼õ¿®¡×ÀßÄê¤ò²Äǽ¤Ë¤·¡¢´Êñ¤ÊÀâÌÀ¤ò²Ã¤¨¤¿¡£
+       * src/prefs_common.c: prefs_send_create(): Á÷¿®¥³¡¼¥É¥»¥Ã¥È¤Î
+         ÀâÌÀ¤òÄɲá£
+
+2001-10-28
+
+       * src/prefs_account.[ch]: ¼õ¿®È¢¤Î¥¨¥ó¥È¥ê¤ò¼õ¿®¥¿¥Ö¤Ë°ÜÆ°¤·¡¢
+         ÁªÂò¥Ü¥¿¥ó¤È´Êñ¤ÊÀâÌÀ¤òÄɲá£
+       * src/Makefile.am: CPPFLAGS ¤Ë SYSCONFDIR ¤òÄɲá£
+       * src/procmime.c:                                                      
+         procmime_get_mime_type_table()                                       
+         procmime_get_mime_type_list(): $(SYSCONFDIR)/mime.types
+         (¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï /etc/mime.types) ¤È
+         $(HOME)/.sylpheed/mime.types ¤òÆɤ߹þ¤à¤è¤¦¤Ë½¤Àµ¡£
+
+2001-10-27
+
+       * src/prefs_account.c: ¥¢¥É¥ì¥¹¼«Æ°»ØÄê¤òºîÀ®¥¿¥Ö¤Ë°ÜÆ°¡£
+         prefs_account_create(): Àµ¤·¤¤¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤òÆÀ¤ë¤¿¤á¤Ë
+         gtk_widget_show_all() ¤òºï½ü¡£
+       * src/prefs_common.c: ¡Ö¥×¥í¥°¥é¥à¤Î¥Ñ¥¹¡×¤ò¡Ö¥³¥Þ¥ó¥É¡×¤ËÊѹ¹¡£
+
 2001-10-26
 
        * src/textview.c: textview_set_font(): EUC-JP locale ¤Ç¥í¥·¥¢¸ì
          ¤Îʸ»ú½¸¹ç¤ËÂбþ¡£
        * src/summaryview.c: summary_delete(): (¿ʬ)ºï½ü»þ¤Î¥¯¥é¥Ã¥·¥å
          ¥Ð¥°¤ò½¤Àµ¡£
+       * prefs_account.c
+         prefs_common.c
+         prefs_summary_column.c: ±Ñ¸ì¤ò¾¯¤·²þÎÉ¡£
+       * src/main.c: get_queued_message_num(): Á÷¿®ÂÔ¤Á¥Õ¥©¥ë¥À¤¬¸«ÉÕ¤«¤é
+         ¤Ê¤¤¾ì¹ç¤Ë·Ù¹ð¤ò½ÐÎϤ·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
 
 2001-10-21
 
index 75697f6..95b94c1 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws15
+EXTRA_VERSION=claws16
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index 7934179..a7ff826 100644 (file)
@@ -83,8 +83,6 @@ static void account_down              (void);
 
 static void account_set_default                (void);
 
-static void account_set_recv_at_get_all        (void);
-
 static void account_edit_close         (void);
 static gint account_delete_event       (GtkWidget      *widget,
                                         GdkEventAny    *event,
@@ -274,9 +272,6 @@ void account_add(void)
        if (ac_prefs->is_default)
                account_set_as_default(ac_prefs);
 
-       if (ac_prefs->recv_at_getall)
-               account_set_as_recv_at_get_all(ac_prefs);
-
        account_clist_set();
 
        if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
@@ -327,24 +322,6 @@ PrefsAccount *account_get_default(void)
        return NULL;
 }
 
-void account_set_as_recv_at_get_all(PrefsAccount *ac_prefs)
-{
-       PrefsAccount *ap;
-       GList *cur;
-
-       for (cur = account_list; cur != NULL; cur = cur->next) {
-               ap = (PrefsAccount *)cur->data;
-               if (ap->account_name == ac_prefs->account_name) {
-                       if (ap->recv_at_getall == 0)
-                               ap->recv_at_getall = 1;
-                       else
-                               ap->recv_at_getall = 0;
-               }
-        }
-
-}
-
-
 void account_set_missing_folder(void)
 {
        PrefsAccount *ap;
@@ -396,6 +373,7 @@ static void account_edit_create(void)
 {
        GtkWidget *window;
        GtkWidget *vbox;
+       GtkWidget *label;
        GtkWidget *hbox;
        GtkWidget *scrolledwin;
        GtkWidget *clist;
@@ -411,8 +389,6 @@ static void account_edit_create(void)
 
        GtkWidget *default_btn;
 
-        GtkWidget *recvatgetall_btn;
-
        GtkWidget *hbbox;
        GtkWidget *close_btn;
 
@@ -433,10 +409,21 @@ static void account_edit_create(void)
                            GTK_SIGNAL_FUNC (manage_window_focus_out), NULL);
        gtk_widget_realize(window);
 
-       vbox = gtk_vbox_new (FALSE, 12);
+       vbox = gtk_vbox_new (FALSE, 10);
        gtk_widget_show (vbox);
        gtk_container_add (GTK_CONTAINER (window), vbox);
 
+       hbox = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+       label = gtk_label_new
+               (_("New messages will be checked in this order. Click in the 'G' column\n"
+                  "to enable message retrieval by `Get all' for that account."));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+
        hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
@@ -520,13 +507,7 @@ static void account_edit_create(void)
        gtk_signal_connect (GTK_OBJECT(default_btn), "clicked",
                            GTK_SIGNAL_FUNC (account_set_default), NULL);
 
-       recvatgetall_btn = gtk_button_new_with_label (_(" Enable/Disable 'Receive at Get all' "));
-       gtk_widget_show (recvatgetall_btn);
-       gtk_box_pack_start (GTK_BOX (vbox2), recvatgetall_btn, TRUE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT(recvatgetall_btn), "clicked",
-                           GTK_SIGNAL_FUNC (account_set_recv_at_get_all), NULL);
-
-        gtkut_button_set_create(&hbbox, &close_btn, _("Close"),
+       gtkut_button_set_create(&hbbox, &close_btn, _("Close"),
                                NULL, NULL, NULL, NULL);
        gtk_widget_show(hbbox);
        gtk_box_pack_end (GTK_BOX (hbox), hbbox, FALSE, FALSE, 0);
@@ -672,23 +653,6 @@ static void account_set_default(void)
        main_window_reflect_prefs_all();
 }
 
-static void account_set_recv_at_get_all(void)
-{
-       GtkCList *clist = GTK_CLIST(edit_account.clist);
-       gint row;
-       PrefsAccount *ac_prefs;
-
-       if (!clist->selection) return;
-
-       row = GPOINTER_TO_INT(clist->selection->data);
-       ac_prefs = gtk_clist_get_row_data(clist, row);
-
-       if ((ac_prefs->protocol != A_POP3) && (ac_prefs->protocol != A_APOP)) return;
-       
-       account_set_as_recv_at_get_all(ac_prefs);
-       account_clist_set();
-}
-
 static void account_edit_close(void)
 {
        account_list_set();
@@ -720,6 +684,16 @@ static void account_selected(GtkCList *clist, gint row, gint column,
 {
        if (event && event->type == GDK_2BUTTON_PRESS)
                account_edit_prefs();
+
+       if (column == COL_GETALL) {
+               PrefsAccount *ac;
+
+               ac = gtk_clist_get_row_data(clist, row);
+               if (ac->protocol == A_POP3 || ac->protocol == A_APOP) {
+                       ac->recv_at_getall ^= TRUE;
+                       account_clist_set_row(ac, row);
+               }
+       }
 }
 
 static void account_key_pressed(GtkWidget *widget, GdkEventKey *event,
index 6b51ea3..18f8c4c 100644 (file)
@@ -352,7 +352,7 @@ static gint get_queued_message_num(void)
        FolderItem *queue;
 
        queue = folder_get_default_queue();
-       g_return_val_if_fail(queue != NULL, -1);
+       if (!queue) return -1;
 
        folder_item_scan(queue);
        return queue->total;
index 416c7ea..45f1363 100644 (file)
@@ -40,6 +40,7 @@
 #include "account.h"
 #include "mainwindow.h"
 #include "manage_window.h"
+#include "foldersel.h"
 #include "inc.h"
 #include "menu.h"
 #include "gtkutils.h"
@@ -63,8 +64,6 @@ static struct Basic {
        GtkWidget *serv_frame;
        GtkWidget *serv_table;
        GtkWidget *protocol_optmenu;
-       GtkWidget *inbox_label;
-       GtkWidget *inbox_entry;
        GtkWidget *recvserv_label;
        GtkWidget *smtpserv_label;
        GtkWidget *nntpserv_label;
@@ -89,6 +88,9 @@ static struct Receive {
        GtkWidget *getall_chkbtn;
        GtkWidget *recvatgetall_chkbtn;
        GtkWidget *filter_on_recv_chkbtn;
+       GtkWidget *inbox_label;
+       GtkWidget *inbox_entry;
+       GtkWidget *inbox_btn;
 
        GtkWidget *imap_frame;
        GtkWidget *imapdir_entry;
@@ -100,13 +102,6 @@ static struct Send {
 
        GtkWidget *customhdr_chkbtn;
 
-       GtkWidget *autocc_chkbtn;
-       GtkWidget *autocc_entry;
-       GtkWidget *autobcc_chkbtn;
-       GtkWidget *autobcc_entry;
-       GtkWidget *autoreplyto_chkbtn;
-       GtkWidget *autoreplyto_entry;
-
        GtkWidget *smtp_auth_chkbtn;
        GtkWidget *smtp_userid_entry;
        GtkWidget *smtp_passwd_entry;
@@ -115,6 +110,13 @@ static struct Send {
 
 static struct Compose {
        GtkWidget *sigpath_entry;
+        
+       GtkWidget *autocc_chkbtn;
+       GtkWidget *autocc_entry;
+       GtkWidget *autobcc_chkbtn;
+       GtkWidget *autobcc_entry;
+       GtkWidget *autoreplyto_chkbtn;
+       GtkWidget *autoreplyto_entry;
 } compose;
 
 #if USE_GPGME
@@ -222,7 +224,7 @@ static PrefParam param[] = {
         &basic.pass_entry, prefs_set_data_from_entry, prefs_set_entry},
 
        {"inbox", "inbox", &tmp_ac_prefs.inbox, P_STRING,
-        &basic.inbox_entry, prefs_set_data_from_entry, prefs_set_entry},
+        &receive.inbox_entry, prefs_set_data_from_entry, prefs_set_entry},
 
        /* Receive */
        {"remove_mail", "TRUE", &tmp_ac_prefs.rmmail, P_BOOL,
@@ -257,30 +259,6 @@ static PrefParam param[] = {
         &send.customhdr_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"set_autocc", "FALSE", &tmp_ac_prefs.set_autocc, P_BOOL,
-        &send.autocc_chkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-
-       {"auto_cc", NULL, &tmp_ac_prefs.auto_cc, P_STRING,
-        &send.autocc_entry,
-        prefs_set_data_from_entry, prefs_set_entry},
-
-       {"set_autobcc", "FALSE", &tmp_ac_prefs.set_autobcc, P_BOOL,
-        &send.autobcc_chkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-
-       {"auto_bcc", NULL, &tmp_ac_prefs.auto_bcc, P_STRING,
-        &send.autobcc_entry,
-        prefs_set_data_from_entry, prefs_set_entry},
-
-       {"set_autoreplyto", "FALSE", &tmp_ac_prefs.set_autoreplyto, P_BOOL,
-        &send.autoreplyto_chkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-
-       {"auto_replyto", NULL, &tmp_ac_prefs.auto_replyto, P_STRING,
-        &send.autoreplyto_entry,
-        prefs_set_data_from_entry, prefs_set_entry},
-
        {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
         &send.smtp_auth_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -300,6 +278,31 @@ static PrefParam param[] = {
         &compose.sigpath_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 
+       {"set_autocc", "FALSE", &tmp_ac_prefs.set_autocc, P_BOOL,
+        &compose.autocc_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
+       {"auto_cc", NULL, &tmp_ac_prefs.auto_cc, P_STRING,
+        &compose.autocc_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
+
+       {"set_autobcc", "FALSE", &tmp_ac_prefs.set_autobcc, P_BOOL,
+        &compose.autobcc_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
+       {"auto_bcc", NULL, &tmp_ac_prefs.auto_bcc, P_STRING,
+        &compose.autobcc_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
+
+       {"set_autoreplyto", "FALSE", &tmp_ac_prefs.set_autoreplyto, P_BOOL,
+        &compose.autoreplyto_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
+       {"auto_replyto", NULL, &tmp_ac_prefs.auto_replyto, P_STRING,
+        &compose.autoreplyto_entry,
+
+        prefs_set_data_from_entry, prefs_set_entry},
+
 #if USE_GPGME
        /* Privacy */
        {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
@@ -380,6 +383,7 @@ static void prefs_account_ssl_create                (void);
 #endif /* USE_SSL */
 static void prefs_account_advanced_create      (void);
 
+static void prefs_account_select_inbox_cb      (void);
 static void prefs_account_edit_custom_header   (void);
 
 static gint prefs_account_deleted              (GtkWidget      *widget,
@@ -602,7 +606,6 @@ static void prefs_account_create(void)
        SET_NOTEBOOK_LABEL(dialog.notebook, _("Advanced"), page++);
 
        prefs_account_fix_size();
-       gtk_widget_show(dialog.window);
 }
 
 /**
@@ -651,8 +654,6 @@ static void prefs_account_basic_create(void)
        GtkWidget *optmenu;
        GtkWidget *optmenu_menu;
        GtkWidget *menuitem;
-       GtkWidget *inbox_label;
-       GtkWidget *inbox_entry;
        GtkWidget *serv_table;
        GtkWidget *recvserv_label;
        GtkWidget *smtpserv_label;
@@ -772,15 +773,6 @@ static void prefs_account_basic_create(void)
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
 
-       inbox_label = gtk_label_new (_("Inbox"));
-       gtk_widget_show (inbox_label);
-       gtk_box_pack_start (GTK_BOX (hbox), inbox_label, FALSE, FALSE, 0);
-
-       inbox_entry = gtk_entry_new ();
-       gtk_widget_show (inbox_entry);
-       gtk_widget_set_usize (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
-       gtk_box_pack_start (GTK_BOX (hbox), inbox_entry, TRUE, TRUE, 0);
-
        serv_table = gtk_table_new (6, 4, FALSE);
        gtk_widget_show (serv_table);
        gtk_box_pack_start (GTK_BOX (vbox2), serv_table, FALSE, FALSE, 0);
@@ -909,8 +901,6 @@ static void prefs_account_basic_create(void)
        basic.serv_frame       = serv_frame;
        basic.serv_table       = serv_table;
        basic.protocol_optmenu = optmenu;
-       basic.inbox_label      = inbox_label;
-       basic.inbox_entry      = inbox_entry;
        basic.recvserv_label   = recvserv_label;
        basic.recvserv_entry   = recvserv_entry;
        basic.smtpserv_label   = smtpserv_label;
@@ -938,8 +928,13 @@ static void prefs_account_receive_create(void)
        GtkWidget *getall_chkbtn;
        GtkWidget *recvatgetall_chkbtn;
        GtkWidget *filter_on_recv_chkbtn;
-       GtkWidget *frame2;
+       GtkWidget *vbox3;
        GtkWidget *hbox1;
+       GtkWidget *inbox_label;
+       GtkWidget *inbox_entry;
+       GtkWidget *inbox_btn;
+       GtkWidget *label;
+       GtkWidget *frame2;
        GtkWidget *imapdir_label;
        GtkWidget *imapdir_entry;
 
@@ -965,6 +960,40 @@ static void prefs_account_receive_create(void)
        PACK_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
                           _("Filter messages on receiving"));
 
+       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+       inbox_label = gtk_label_new (_("Default inbox"));
+       gtk_widget_show (inbox_label);
+       gtk_box_pack_start (GTK_BOX (hbox1), inbox_label, FALSE, FALSE, 0);
+
+       inbox_entry = gtk_entry_new ();
+       gtk_widget_show (inbox_entry);
+       gtk_widget_set_usize (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
+       gtk_box_pack_start (GTK_BOX (hbox1), inbox_entry, TRUE, TRUE, 0);
+
+       inbox_btn = gtk_button_new_with_label (_(" Select... "));
+       gtk_widget_show (inbox_btn);
+       gtk_box_pack_start (GTK_BOX (hbox1), inbox_btn, FALSE, FALSE, 0);
+       gtk_signal_connect (GTK_OBJECT (inbox_btn), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_account_select_inbox_cb),
+                           NULL);
+
+       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+       label = gtk_label_new
+               (_("(Unfiltered messages will be stored in this folder)"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
        PACK_FRAME (vbox1, frame2, _("IMAP4"));
 
        vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
@@ -989,6 +1018,9 @@ static void prefs_account_receive_create(void)
        receive.getall_chkbtn         = getall_chkbtn;
        receive.recvatgetall_chkbtn   = recvatgetall_chkbtn;
        receive.filter_on_recv_chkbtn = filter_on_recv_chkbtn;
+       receive.inbox_label           = inbox_label;
+       receive.inbox_entry           = inbox_entry;
+       receive.inbox_btn             = inbox_btn;
 
        receive.imap_frame    = frame2;
        receive.imapdir_entry = imapdir_entry;
@@ -1004,14 +1036,6 @@ static void prefs_account_send_create(void)
        GtkWidget *hbox;
        GtkWidget *customhdr_chkbtn;
        GtkWidget *customhdr_edit_btn;
-       GtkWidget *frame2;
-       GtkWidget *table;
-       GtkWidget *autocc_chkbtn;
-       GtkWidget *autocc_entry;
-       GtkWidget *autobcc_chkbtn;
-       GtkWidget *autobcc_entry;
-       GtkWidget *autoreplyto_chkbtn;
-       GtkWidget *autoreplyto_entry;
        GtkWidget *frame3;
        GtkWidget *vbox3;
        GtkWidget *smtp_auth_chkbtn;
@@ -1055,54 +1079,6 @@ static void prefs_account_send_create(void)
 
        SET_TOGGLE_SENSITIVITY (customhdr_chkbtn, customhdr_edit_btn);
 
-       PACK_FRAME (vbox1, frame2, _("Automatically set following addresses"));
-
-       table =  gtk_table_new (3, 2, FALSE);
-       gtk_widget_show (table);
-       gtk_container_add (GTK_CONTAINER (frame2), table);
-       gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-       gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
-       gtk_table_set_col_spacings (GTK_TABLE (table), 8);
-
-       autocc_chkbtn = gtk_check_button_new_with_label (_("Cc"));
-       gtk_widget_show (autocc_chkbtn);
-       gtk_table_attach (GTK_TABLE (table), autocc_chkbtn, 0, 1, 0, 1,
-                         GTK_FILL, 0, 0, 0);
-
-       autocc_entry = gtk_entry_new ();
-       gtk_widget_show (autocc_entry);
-       gtk_table_attach (GTK_TABLE (table), autocc_entry, 1, 2, 0, 1,
-                         GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                         GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-       SET_TOGGLE_SENSITIVITY (autocc_chkbtn, autocc_entry);
-
-       autobcc_chkbtn = gtk_check_button_new_with_label (_("Bcc"));
-       gtk_widget_show (autobcc_chkbtn);
-       gtk_table_attach (GTK_TABLE (table), autobcc_chkbtn, 0, 1, 1, 2,
-                         GTK_FILL, 0, 0, 0);
-
-       autobcc_entry = gtk_entry_new ();
-       gtk_widget_show (autobcc_entry);
-       gtk_table_attach (GTK_TABLE (table), autobcc_entry, 1, 2, 1, 2,
-                         GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                         GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-       SET_TOGGLE_SENSITIVITY (autobcc_chkbtn, autobcc_entry);
-
-       autoreplyto_chkbtn = gtk_check_button_new_with_label (_("Reply-To"));
-       gtk_widget_show (autoreplyto_chkbtn);
-       gtk_table_attach (GTK_TABLE (table), autoreplyto_chkbtn, 0, 1, 2, 3,
-                         GTK_FILL, 0, 0, 0);
-
-       autoreplyto_entry = gtk_entry_new ();
-       gtk_widget_show (autoreplyto_entry);
-       gtk_table_attach (GTK_TABLE (table), autoreplyto_entry, 1, 2, 2, 3,
-                         GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                         GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-       SET_TOGGLE_SENSITIVITY (autoreplyto_chkbtn, autoreplyto_entry);
-
        PACK_FRAME (vbox1, frame3, _("Authentication"));
 
        vbox3 = gtk_vbox_new (FALSE, 0);
@@ -1112,11 +1088,6 @@ static void prefs_account_send_create(void)
 
        PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
                _("SMTP Authentication (SMTP AUTH)"));
-
-       smtp_auth_hbox = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (smtp_auth_hbox);
-       gtk_box_pack_start (GTK_BOX (vbox3), smtp_auth_hbox, FALSE, FALSE, 0);
-
        label = gtk_label_new ("");
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), label, FALSE, FALSE, 0);
@@ -1158,16 +1129,7 @@ static void prefs_account_send_create(void)
        send.msgid_chkbtn     = msgid_chkbtn;
        send.customhdr_chkbtn = customhdr_chkbtn;
 
-       send.autocc_chkbtn      = autocc_chkbtn;
-       send.autocc_entry       = autocc_entry;
-       send.autobcc_chkbtn     = autobcc_chkbtn;
-       send.autobcc_entry      = autobcc_entry;
-       send.autoreplyto_chkbtn = autoreplyto_chkbtn;
-       send.autoreplyto_entry  = autoreplyto_entry;
-
        send.smtp_auth_chkbtn    = smtp_auth_chkbtn;
-       send.smtp_userid_entry   = smtp_userid_entry;
-       send.smtp_passwd_entry   = smtp_passwd_entry;
        send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
 }
 
@@ -1177,6 +1139,14 @@ static void prefs_account_compose_create(void)
        GtkWidget *hbox;
        GtkWidget *label;
        GtkWidget *sigpath_entry;
+       GtkWidget *frame;
+       GtkWidget *table;
+       GtkWidget *autocc_chkbtn;
+       GtkWidget *autocc_entry;
+       GtkWidget *autobcc_chkbtn;
+       GtkWidget *autobcc_entry;
+       GtkWidget *autoreplyto_chkbtn;
+       GtkWidget *autoreplyto_entry;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -1195,7 +1165,62 @@ static void prefs_account_compose_create(void)
        gtk_widget_show (sigpath_entry);
        gtk_box_pack_start (GTK_BOX (hbox), sigpath_entry, TRUE, TRUE, 0);
 
+       PACK_FRAME (vbox1, frame, _("Automatically set the following addresses"));
+
+       table =  gtk_table_new (3, 2, FALSE);
+       gtk_widget_show (table);
+       gtk_container_add (GTK_CONTAINER (frame), table);
+       gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+       gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
+       gtk_table_set_col_spacings (GTK_TABLE (table), 8);
+
+       autocc_chkbtn = gtk_check_button_new_with_label (_("Cc"));
+       gtk_widget_show (autocc_chkbtn);
+       gtk_table_attach (GTK_TABLE (table), autocc_chkbtn, 0, 1, 0, 1,
+                         GTK_FILL, 0, 0, 0);
+
+       autocc_entry = gtk_entry_new ();
+       gtk_widget_show (autocc_entry);
+       gtk_table_attach (GTK_TABLE (table), autocc_entry, 1, 2, 0, 1,
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+
+       SET_TOGGLE_SENSITIVITY (autocc_chkbtn, autocc_entry);
+
+       autobcc_chkbtn = gtk_check_button_new_with_label (_("Bcc"));
+       gtk_widget_show (autobcc_chkbtn);
+       gtk_table_attach (GTK_TABLE (table), autobcc_chkbtn, 0, 1, 1, 2,
+                         GTK_FILL, 0, 0, 0);
+
+       autobcc_entry = gtk_entry_new ();
+       gtk_widget_show (autobcc_entry);
+       gtk_table_attach (GTK_TABLE (table), autobcc_entry, 1, 2, 1, 2,
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+
+       SET_TOGGLE_SENSITIVITY (autobcc_chkbtn, autobcc_entry);
+
+       autoreplyto_chkbtn = gtk_check_button_new_with_label (_("Reply-To"));
+       gtk_widget_show (autoreplyto_chkbtn);
+       gtk_table_attach (GTK_TABLE (table), autoreplyto_chkbtn, 0, 1, 2, 3,
+                         GTK_FILL, 0, 0, 0);
+
+       autoreplyto_entry = gtk_entry_new ();
+       gtk_widget_show (autoreplyto_entry);
+       gtk_table_attach (GTK_TABLE (table), autoreplyto_entry, 1, 2, 2, 3,
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+
+       SET_TOGGLE_SENSITIVITY (autoreplyto_chkbtn, autoreplyto_entry);
+
        compose.sigpath_entry = sigpath_entry;
+
+       compose.autocc_chkbtn      = autocc_chkbtn;
+       compose.autocc_entry       = autocc_entry;
+       compose.autobcc_chkbtn     = autobcc_chkbtn;
+       compose.autobcc_entry      = autobcc_entry;
+       compose.autoreplyto_chkbtn = autoreplyto_chkbtn;
+       compose.autoreplyto_entry  = autoreplyto_entry;
 }
 
 #if USE_GPGME
@@ -1528,6 +1553,15 @@ static void prefs_account_cancel(void)
        gtk_main_quit();
 }
 
+static void prefs_account_select_inbox_cb(void)
+{
+       FolderItem *item;
+
+       item = foldersel_folder_sel(NULL, NULL);
+       if (item)
+               gtk_entry_set_text(GTK_ENTRY(receive.inbox_entry), item->path);
+}
+
 static void prefs_account_edit_custom_header(void)
 {
        prefs_custom_header_open(&tmp_ac_prefs);
@@ -1635,8 +1669,6 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
 
        switch(protocol) {
        case A_NNTP:
-               gtk_widget_set_sensitive(basic.inbox_label, FALSE);
-               gtk_widget_set_sensitive(basic.inbox_entry, FALSE);
                gtk_widget_show(basic.nntpserv_label);
                gtk_widget_show(basic.nntpserv_entry);
                gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
@@ -1692,8 +1724,6 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_show(advanced.nntpport_hbox);
                break;
        case A_LOCAL:
-               gtk_widget_set_sensitive(basic.inbox_label, TRUE);
-               gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
                gtk_widget_hide(basic.nntpserv_label);
                gtk_widget_hide(basic.nntpserv_entry);
                gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
@@ -1748,8 +1778,6 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.nntpport_hbox);
                break;
        case A_IMAP4:
-               gtk_widget_set_sensitive(basic.inbox_label, FALSE);
-               gtk_widget_set_sensitive(basic.inbox_entry, FALSE);
                gtk_widget_hide(basic.nntpserv_label);
                gtk_widget_hide(basic.nntpserv_entry);
                gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
@@ -1807,8 +1835,6 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                break;
        case A_POP3:
        default:
-               gtk_widget_set_sensitive(basic.inbox_label, TRUE);
-               gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
                gtk_widget_hide(basic.nntpserv_label);
                gtk_widget_hide(basic.nntpserv_entry);
                gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
index 341174b..43e6fbb 100644 (file)
@@ -66,7 +66,6 @@ struct _PrefsAccount
 
        /* Server info */
        RecvProtocol protocol;
-       gchar *inbox;
        gchar *recv_server;
        gchar *smtp_server;
        gchar *nntp_server;
@@ -85,7 +84,6 @@ struct _PrefsAccount
        SSLSMTPType ssl_smtp;
 #endif /* USE_SSL */
 
-
        /* Temporarily preserved password */
        gchar *tmp_pass;
        gchar *tmp_smtp_passwd;
@@ -95,6 +93,7 @@ struct _PrefsAccount
        gboolean getall;
        gboolean recv_at_getall;
        gboolean filter_on_recv;
+       gchar *inbox;
 
        gchar *imap_dir;
 
@@ -102,12 +101,6 @@ struct _PrefsAccount
        gboolean  add_date;
        gboolean  gen_msgid;
        gboolean  add_customhdr;
-       gboolean  set_autocc;
-       gchar    *auto_cc;
-       gboolean  set_autobcc;
-       gchar    *auto_bcc;
-       gboolean  set_autoreplyto;
-       gchar    *auto_replyto;
        gboolean use_smtp_auth;
        gchar    *smtp_userid;
        gchar    *smtp_passwd;
@@ -117,6 +110,12 @@ struct _PrefsAccount
 
        /* Compose */
        gchar *sig_path;
+       gboolean  set_autocc;
+       gchar    *auto_cc;
+       gboolean  set_autobcc;
+       gchar    *auto_bcc;
+       gboolean  set_autoreplyto;
+       gchar    *auto_replyto;
 
 #if USE_GPGME
        /* Privacy */
index 084be4a..62c0706 100644 (file)
@@ -891,7 +891,7 @@ static void prefs_receive_create(void)
        gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
        SET_TOGGLE_SENSITIVITY (checkbtn_incext, hbox);
 
-       label_incext = gtk_label_new (_("Program path"));
+       label_incext = gtk_label_new (_("Command"));
        gtk_widget_show (label_incext);
        gtk_box_pack_start (GTK_BOX (hbox), label_incext, FALSE, FALSE, 0);
 
@@ -1037,6 +1037,7 @@ static void prefs_send_create(void)
        GtkWidget *optmenu_menu;
        GtkWidget *menuitem;
        GtkWidget *checkbtn_returnreceipt;
+       GtkWidget *label_charset_desc;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -1058,7 +1059,7 @@ static void prefs_send_create(void)
        gtk_box_pack_start (GTK_BOX (vbox_extsend), hbox1, FALSE, FALSE, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_extsend, hbox1);
 
-       label_extsend = gtk_label_new (_("Program path"));
+       label_extsend = gtk_label_new (_("Command"));
        gtk_widget_show (label_extsend);
        gtk_box_pack_start (GTK_BOX (hbox1), label_extsend, FALSE, FALSE, 0);
 
@@ -1093,7 +1094,7 @@ static void prefs_send_create(void)
 
        optmenu = gtk_option_menu_new ();
        gtk_widget_show (optmenu);
-       gtk_box_pack_start(GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
 
        optmenu_menu = gtk_menu_new ();
 
@@ -1136,6 +1137,18 @@ static void prefs_send_create(void)
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
 
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       label_charset_desc = gtk_label_new
+               (_("If `Automatic' is selected, the optimal encoding\n"
+                  "for the current locale will be used."));
+       gtk_widget_show (label_charset_desc);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_charset_desc,
+                           FALSE, FALSE, 0);
+       gtk_label_set_justify(GTK_LABEL (label_charset_desc), GTK_JUSTIFY_LEFT);
+
        send.checkbtn_extsend = checkbtn_extsend;
        send.entry_extsend    = entry_extsend;
        /* send.button_extsend   = button_extsend; */
@@ -2133,7 +2146,9 @@ static void prefs_interface_create(void)
        gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
 
        label = gtk_label_new
-               (_("(Messages will be marked until execution if this is turned off)"));
+               (_("(Messages will be marked until execution\n"
+                  " if this is turned off)"));
+       gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 8);
        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
index 854c28b..3bb6a9a 100644 (file)
@@ -190,8 +190,8 @@ static void prefs_summary_column_create(void)
        gtk_box_pack_start(GTK_BOX(vbox), label_hbox, FALSE, FALSE, 4);
 
        label = gtk_label_new
-               (_("Select items to be displayed on the summary view.\n"
-                  "You can modify the order by using the Up / Down buttons, or dragging the items."));
+               (_("Select items to be displayed on the summary view. You can modify\n"
+                  "the order by using the Up / Down button, or dragging the items."));
        gtk_widget_show(label);
        gtk_box_pack_start(GTK_BOX(label_hbox), label, FALSE, FALSE, 4);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
index 6254aee..a0b2a59 100644 (file)
@@ -584,6 +584,7 @@ MsgInfo *procheader_file_parse(FILE * fp, MsgFlags flags,
                        msginfo->msgid = g_strdup(hp);
                        break;
                case H_REFERENCES:
+               case H_IN_REPLY_TO:
                        if (!reference) {
                                msginfo->references = g_strdup(hp);
                                eliminate_parenthesis(hp, '(', ')');
@@ -596,15 +597,6 @@ MsgInfo *procheader_file_parse(FILE * fp, MsgFlags flags,
                                }
                        }
                        break;
-               case H_IN_REPLY_TO:
-                       if (!reference) {
-                               eliminate_parenthesis(hp, '(', ')');
-                               extract_parenthesis(hp, '<', '>');
-                               remove_space(hp);
-                               if (*hp != '\0')
-                                       reference = g_strdup(hp);
-                       }
-                       break;
                case H_CONTENT_TYPE:
                        if (!strncasecmp(hp, "multipart", 9))
                                MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MIME);
index 59c2b52..7cb1a87 100644 (file)
@@ -3770,7 +3770,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_TRIANGLE);
 #endif
-       gtk_ctree_set_indent(GTK_CTREE(ctree), 18);
+       gtk_ctree_set_indent(GTK_CTREE(ctree), 16);
        gtk_object_set_user_data(GTK_OBJECT(ctree), summaryview);
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {