From: Paul Mangan Date: Wed, 2 Oct 2002 10:24:03 +0000 (+0000) Subject: sync with 0.8.4cvs1 X-Git-Tag: rel_0_8_5~23 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=038c3f0a138f0dac83ff93945e2fd775f5a739d5 sync with 0.8.4cvs1 --- diff --git a/ChangeLog b/ChangeLog index c23b34148..a31a6c74b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2002-10-02 + + * src/inc.c: inc_account_mail(), inc_all_account_mail(): update + IMAP4 and NNTP folder summary after checking those accounts. + +2002-10-01 + + * version 0.8.4 + +2002-10-01 + + * src/prefs_common.c: prefs_compose_create(): modified the label + of the option for Reply button. + * configure.in: add -lldap and -llber to the 5th argument of + AC_CHECK_LIB() for LDAP library detection. + +2002-09-30 + + * INSTALL + INSTALL.jp: updated. + +2002-09-30 + + * src/mainwindow.c: toggle the behavior of Reply button between + normal reply and reply-to-list. + * src/prefs_common.[ch]: added an option to switch the function + of Reply button. + 2002-09-27 * src/compose.c: compose_new(): removed the workaround for XIM diff --git a/ChangeLog.claws b/ChangeLog.claws index a4d79f8da..6238ed6c1 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,12 @@ +2002-10-02 [paul] 0.8.3claws41 + + * sync with 0.8.4cvs1 + see ChangeLog 2002-09-30, 2002-10-01, 2002-10-02 + + * src/summaryview.c + toggle the behavior of Reply menuitem between + normal reply and reply-to-list + 2002-10-01 [sergey] 0.8.3claws40 * src/compose.c diff --git a/ChangeLog.jp b/ChangeLog.jp index fd62a3692..2ab677964 100644 --- a/ChangeLog.jp +++ b/ChangeLog.jp @@ -1,3 +1,32 @@ +2002-10-02 + + * src/inc.c: inc_account_mail(), inc_all_account_mail(): IMAP4 ¤È + NNTP ¤Î¥¢¥«¥¦¥ó¥È¤ò¥Á¥§¥Ã¥¯¤·¤¿¸å¤½¤ì¤é¤Î¥Õ¥©¥ë¥À¤Î¥µ¥Þ¥ê¤ò¹¹¿· + ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£ + +2002-10-01 + + * version 0.8.4 + +2002-10-01 + + * src/prefs_common.c: prefs_compose_create(): ÊÖ¿®¥Ü¥¿¥ó¤Î¥ª¥×¥·¥ç¥ó + ¤Î¥é¥Ù¥ë¤ò½¤Àµ¡£ + * configure.in: LDAP ¥é¥¤¥Ö¥é¥ê¸¡½Ð¤Î AC_CHECK_LIB() ¤Î5ÈÖÌܤΰú¿ô + ¤Ë -lldap ¤È -llber ¤òÄɲᣠ+ +2002-09-30 + + * INSTALL + INSTALL.jp: ¹¹¿·¡£ + +2002-09-30 + + * src/mainwindow.c: ÊÖ¿®¥Ü¥¿¥ó¤ÎµóÆ°¤òÄ̾ï¤ÎÊÖ¿®¤È ML ¤Ø¤ÎÊÖ¿® + ¤È¤ÇÀÚ¤êÂؤ¨¤ë¤è¤¦¤Ë¤·¤¿¡£ + * src/prefs_common.[ch]: ÊÖ¿®¥Ü¥¿¥ó¤Îµ¡Ç½¤òÀÚ¤êÂؤ¨¤ë¥ª¥×¥·¥ç¥ó + ¤òÄɲᣠ+ 2002-09-27 * src/compose.c: compose_new(): ¸ú²Ì¤¬Ìµ¤¯¡¢¥Ï¥ó¥°¤ò°ú¤­µ¯¤³¤¹¤À¤± diff --git a/INSTALL b/INSTALL index 403075b4e..846bbe646 100644 --- a/INSTALL +++ b/INSTALL @@ -104,8 +104,9 @@ Password: [Enter password] Additional libraries ==================== -I recommend you to install gdk-pixbuf or gdk_imlib library before installing -for built-in image view support, and compface library for X-Face support. +It is recommend to install gdk-pixbuf or gdk_imlib library before installing +Sylpheed for built-in image view support, and compface library for X-Face +support. You can get compface utilities and library from the following location: @@ -116,30 +117,30 @@ If you want other character set / encoding (such as UTF-8, KOI8-R, and GB2312) to be supported, you have to install libjconv, which is a wrapper for iconv(). You can obtain it from the following location: - http://www.kondara.org/libjconv/index.html + http://ghost.math.sci.hokudai.ac.jp/misc/libjconv/ -If you want to enable SSL support, append the option ---enable-ssl after ./configure (you need OpenSSL). - -If you want to enable IPv6 support, append the option ---enable-ipv6 after ./configure. - -If you want to enable GnuPG support, you need GPGME 0.2.3 or later, and -GnuPG 1.0.6 or later. You can get them from the following location: +GnuPG (>= 1.0.7) and GPGME (>= 0.3.5) are required for GnuPG (PGP) support. +You can get GnuPG and GPGME from the following location: ftp://ftp.gnupg.org/pub/gcrypt/alpha/gpgme/ ftp://ftp.gnupg.org/pub/gcrypt/gnupg/ -and append the option --enable-gpgme after ./configure. +Options for configure script +============================ -WARNING: the GnuPG support is still in the development stage, and it - may not work correctly. I suggest never to use a real key. - Please use sample keys. + --disable-compface disable compface (X-Face) support + --disable-jconv disable libjconv support + --enable-ssl SSL support (requires OpenSSL) + --enable-ipv6 IPv6 support + --enable-gpgme GnuPG support (requires GPGME and GnuPG) + --enable-ldap LDAP support + --enable-jpilot JPilot support For other options, refer to ./configure --help . -If the installation of Sylpheed failed, check all needed libraries are -correctly installed. If it still failed, please send bug report to: +If the installation of Sylpheed failed, check whether all the required +libraries are correctly installed. If it still failed, please send bug +report to: Hiroyuki Yamamoto diff --git a/INSTALL.jp b/INSTALL.jp index c9640e6b4..6062d39d3 100644 --- a/INSTALL.jp +++ b/INSTALL.jp @@ -117,25 +117,24 @@ Sylpheed ¤ËÂбþ¤µ¤»¤¿¤¤¾ì¹ç¤Ï¡¢ libjconv (iconv() ¤Î¥é¥Ã¥Ñ¡¼) ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë ɬÍפ¬¤¢¤ê¤Þ¤¹¡£ libjconv ¤Ï°Ê²¼¤Î¾ì½ê¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹: - http://www.kondara.org/libjconv/index.html + http://ghost.math.sci.hokudai.ac.jp/misc/libjconv/ -SSL Âбþ¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ ./configure ¤Î¸å¤Ë ---enable-ssl ¥ª¥×¥·¥ç¥ó¤òÄɲ䷤Ƥ¯¤À¤µ¤¤(OpenSSL ¤¬É¬ÍפǤ¹)¡£ - -IPv6 Âбþ¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ ./configure ¤Î¸å¤Ë ---enable-ipv6 ¥ª¥×¥·¥ç¥ó¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£ - -GnuPG Âбþ¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ GPGME 0.2.3 °Ê¹ß¤È GnuPG 1.0.6 °Ê¹ß¤¬ +GnuPG (PGP)Âбþ¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ GPGME 0.3.5 °Ê¹ß¤È GnuPG 1.0.7 °Ê¹ß¤¬ ɬÍפǤ¹¡£°Ê²¼¤Î¾ì½ê¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹: ftp://ftp.gnupg.org/pub/gcrypt/alpha/gpgme/ ftp://ftp.gnupg.org/pub/gcrypt/gnupg/ -./configure ¤Î¸å¤Ë --enable-gpgme ¥ª¥×¥·¥ç¥ó¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£ +configure ¥¹¥¯¥ê¥×¥È¤Î¥ª¥×¥·¥ç¥ó +================================ -·Ù¹ð: GnuPG Âбþ¤Ï¤Þ¤À³«È¯ÅÓ¾å¤ÎÃʳ¬¤Ç¤¢¤ê¡¢Àµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£ - ·è¤·¤ÆËÜÅö¤Î¸°¤ò»È¤ï¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£¥µ¥ó¥×¥ë¤Î¸°¤ò¤ª»È¤¤¤¯¤À - ¤µ¤¤¡£ + --disable-compface compface (X-Face)Âбþ¤ò̵¸ú¤Ë¤¹¤ë + --disable-jconv libjconv Âбþ¤ò̵¸ú¤Ë¤¹¤ë + --enable-ssl SSL Âбþ (Í× OpenSSL) + --enable-ipv6 IPv6 Âбþ + --enable-gpgme GnuPG Âбþ (Í× GPGME ¤È GnuPG) + --enable-ldap LDAP Âбþ + --enable-jpilot JPilot Âбþ ¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï ./configure --help ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ diff --git a/NEWS b/NEWS index e3e5aba65..c36b91522 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,17 @@ Changes of Sylpheed +* 0.8.4 + + * The 'Select thread' function is added. + * The 'Reply to mailing list' function is added. + * The 'Reply' button invokes 'Reply to list' by default (configurable). + * More fix for GnuPG signing and verification has been made. + * The bug that deleted messages that are not received by filter has + been fixed. + * The bug that couldn't exit normally after opening composition window + has been fixed. + * The LDAP library detection of configure script has been fixed. + * 0.8.3 * The state of compose window is now changed automatically when the diff --git a/configure.in b/configure.in index a1e85275d..a4f7e191c 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ MINOR_VERSION=8 MICRO_VERSION=3 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws40 +EXTRA_VERSION=claws41 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/inc.c b/src/inc.c index 673de66e1..9b68a4d39 100644 --- a/src/inc.c +++ b/src/inc.c @@ -237,11 +237,15 @@ static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin) IncProgressDialog *inc_dialog; IncSession *session; gchar *text[3]; + FolderItem *item = mainwin->summaryview->folder_item; switch (account->protocol) { case A_IMAP4: case A_NNTP: folderview_check_new(FOLDER(account->folder)); + if (!prefs_common.scan_all_after_inc && item != NULL && + FOLDER(account->folder) == item->folder) + folderview_update_item(item, TRUE); return 1; case A_POP3: @@ -316,8 +320,14 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean notify) for (; list != NULL; list = list->next) { PrefsAccount *account = list->data; if ((account->protocol == A_IMAP4 || - account->protocol == A_NNTP) && account->recv_at_getall) + account->protocol == A_NNTP) && account->recv_at_getall) { + FolderItem *item = mainwin->summaryview->folder_item; + folderview_check_new(FOLDER(account->folder)); + if (!prefs_common.scan_all_after_inc && item != NULL && + FOLDER(account->folder) == item->folder) + folderview_update_item(item, TRUE); + } } /* check POP3 accounts */ diff --git a/src/mainwindow.c b/src/mainwindow.c index 8f005d7ac..5b58dd0bc 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2328,10 +2328,16 @@ static void toolbar_reply_cb(GtkWidget *widget, { MainWindow *mainwin = (MainWindow *)data; - reply_cb(mainwin, - prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE - : COMPOSE_REPLY_WITHOUT_QUOTE, - NULL); + if (prefs_common.default_reply_list) + reply_cb(mainwin, + prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE + : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, + NULL); + else + reply_cb(mainwin, + prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE + : COMPOSE_REPLY_WITHOUT_QUOTE, + NULL); } static void toolbar_reply_to_all_cb(GtkWidget *widget, diff --git a/src/prefs_common.c b/src/prefs_common.c index a70e19de3..ba2a84cf0 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -121,6 +121,7 @@ static struct Compose { GtkWidget *checkbtn_forward_account_autosel; GtkWidget *checkbtn_reedit_account_autosel; GtkWidget *checkbtn_quote; + GtkWidget *checkbtn_default_reply_list; GtkWidget *checkbtn_forward_as_attachment; GtkWidget *checkbtn_redirect_keep_from; GtkWidget *checkbtn_smart_wrapping; @@ -433,6 +434,10 @@ static PrefParam param[] = { &compose.checkbtn_reedit_account_autosel, prefs_set_data_from_toggle, prefs_set_toggle}, + {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL, + &compose.checkbtn_default_reply_list, + prefs_set_data_from_toggle, prefs_set_toggle}, + {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL, NULL, NULL, NULL}, @@ -1732,6 +1737,8 @@ static void prefs_compose_create(void) GtkWidget *checkbtn_autowrap; GtkWidget *checkbtn_wrapatsend; + GtkWidget *checkbtn_default_reply_list; + GtkWidget *checkbtn_forward_as_attachment; GtkWidget *checkbtn_redirect_keep_from; GtkWidget *checkbtn_smart_wrapping; @@ -1790,6 +1797,9 @@ static void prefs_compose_create(void) gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); + PACK_CHECK_BUTTON (vbox2, checkbtn_default_reply_list, + _("Reply button invokes mailing list reply")); + PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit, _("Automatically launch the external editor")); @@ -1916,7 +1926,7 @@ static void prefs_compose_create(void) checkbtn_smart_wrapping; compose.checkbtn_block_cursor = checkbtn_block_cursor; - + compose.checkbtn_default_reply_list = checkbtn_default_reply_list; } static void prefs_quote_create(void) diff --git a/src/prefs_common.h b/src/prefs_common.h index 55c270ab8..e8ecc8752 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -86,6 +86,7 @@ struct _PrefsCommon gboolean linewrap_at_send; gboolean auto_exteditor; gboolean reply_account_autosel; + gboolean default_reply_list; gboolean forward_account_autosel; gboolean reedit_account_autosel; gboolean show_ruler; diff --git a/src/summaryview.c b/src/summaryview.c index 832418ef2..9ef43fd85 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -4042,14 +4042,24 @@ void summary_reply(SummaryView *summaryview, ComposeMode mode) switch (mode) { case COMPOSE_REPLY: - compose_reply(msginfo, prefs_common.reply_with_quote, - FALSE, FALSE, FALSE, text); + if (prefs_common.default_reply_list) + compose_reply(msginfo, prefs_common.reply_with_quote, + FALSE, TRUE, FALSE, text); + else + compose_reply(msginfo, prefs_common.reply_with_quote, + FALSE, FALSE, FALSE, text); break; case COMPOSE_REPLY_WITH_QUOTE: - compose_reply(msginfo, TRUE, FALSE, FALSE, FALSE, text); + if (prefs_common.default_reply_list) + compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text); + else + compose_reply(msginfo, TRUE, FALSE, FALSE, FALSE, text); break; case COMPOSE_REPLY_WITHOUT_QUOTE: - compose_reply(msginfo, FALSE, FALSE, FALSE, FALSE, NULL); + if (prefs_common.default_reply_list) + compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL); + else + compose_reply(msginfo, FALSE, FALSE, FALSE, FALSE, NULL); break; case COMPOSE_REPLY_TO_SENDER: compose_reply(msginfo, prefs_common.reply_with_quote,