From c6c44d48e8c104ccbee8d3cef3b71d1149c42645 Mon Sep 17 00:00:00 2001 From: Thorsten Maerz Date: Sun, 12 May 2002 11:03:49 +0000 Subject: [PATCH] sync claws18 --- ChangeLog | 5 +++++ ChangeLog.claws | 10 +++++----- ChangeLog.jp | 5 +++++ configure.in | 2 +- src/generated.diff | 2 +- src/prefs_account.c | 25 +++++++++++++++++++++++++ src/prefs_common.c | 3 +++ src/summaryview.c | 1 + 8 files changed, 46 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f4ce7e48..4eb91528d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2002-05-11 + * src/prefs_account.c: turn off "receive at get all" option by default + when creating an IMAP or News account. + +2002-05-11 + * src/imap.c: imap_scan_tree(): don't use namespace for prefix. * src/prefs_folder_item.c: show also identifier path. Made layout using table. Show uneditable entry using background diff --git a/ChangeLog.claws b/ChangeLog.claws index 1502b6c98..def4f3cac 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,8 @@ +2002-05-12 [paul] 0.7.5claws19 + + * sync with 0.7.5cvs20 + see ChangeLog 2002-05-11 + 2002-05-12 [alfons] 0.7.5claws18 * src/quote_fmt_lex.l @@ -14,11 +19,6 @@ * sync with 0.7.5cvs19 (except src/prefs_folder_item.c) see ChangeLog 2002-05-10 and 2002-05-11 -2002-05-11 [paul] 0.7.5claws17 - - * sync with 0.7.5cvs19 (except src/prefs_folder_item.c) - see ChangeLog 2002-05-10 and 2002-05-11 - 2002-05-10 [paul] 0.7.5claws16 * sync with 0.7.5cvs16 diff --git a/ChangeLog.jp b/ChangeLog.jp index 7817990ab..27679edae 100644 --- a/ChangeLog.jp +++ b/ChangeLog.jp @@ -1,5 +1,10 @@ 2002-05-11 + * src/prefs_account.c: IMAP ¤Þ¤¿¤Ï News ¥¢¥«¥¦¥ó¥È¤òºîÀ®¤¹¤ë¤È¤­¤Ë + ¡ÖÁ´¼õ¿®¤Ç¼õ¿®¡×¥ª¥×¥·¥ç¥ó¤ò¥Ç¥Õ¥©¥ë¥È¤Ç¥ª¥Õ¤Ë¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£ + +2002-05-11 + * src/imap.c: imap_scan_tree(): namespace ¤ò¥×¥ì¥Õ¥£¥¯¥¹¤Ë»ÈÍѤ·¤Ê¤¤ ¤è¤¦¤Ë¤·¤¿¡£ * src/prefs_folder_item.c: ¼±Ê̻ҥѥ¹¤âɽ¼¨¡£ diff --git a/configure.in b/configure.in index 70a887463..484db1834 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ MINOR_VERSION=7 MICRO_VERSION=5 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws18 +EXTRA_VERSION=claws19 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/generated.diff b/src/generated.diff index fd4d268e7..8cb5ff5ac 100644 --- a/src/generated.diff +++ b/src/generated.diff @@ -8664,7 +8664,7 @@ diff -urN empty/version.h src/version.h +#define __VERSION_H__ + +#define PACKAGE "sylpheed" -+#define VERSION "0.7.5claws18 WIN32" ++#define VERSION "0.7.5claws19 WIN32" +#define PROG_VERSION "Sylpheed version "VERSION + +#endif /* __VERSION_H__ */ diff --git a/src/prefs_account.c b/src/prefs_account.c index e7c547192..2c8880535 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -2066,6 +2066,13 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem) (GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL); gtk_widget_set_sensitive(receive.pop3_frame, FALSE); gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE); + + if (!tmp_ac_prefs.account_name) { + gtk_toggle_button_set_active + (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), + FALSE); + } + #if USE_SSL gtk_widget_set_sensitive(ssl.receive_frame, TRUE); gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE); @@ -2124,6 +2131,12 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem) prefs_account_mailcmd_toggled (GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL); + if (!tmp_ac_prefs.account_name) { + gtk_toggle_button_set_active + (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), + TRUE); + } + #if USE_SSL gtk_widget_set_sensitive(ssl.receive_frame, FALSE); gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE); @@ -2184,6 +2197,12 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem) gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE); gtk_widget_set_sensitive(basic.smtpserv_label, TRUE); + if (!tmp_ac_prefs.account_name) { + gtk_toggle_button_set_active + (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), + FALSE); + } + #if USE_SSL gtk_widget_set_sensitive(ssl.receive_frame, TRUE); gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE); @@ -2245,6 +2264,12 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem) gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE); gtk_widget_set_sensitive(basic.smtpserv_label, TRUE); + if (!tmp_ac_prefs.account_name) { + gtk_toggle_button_set_active + (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), + TRUE); + } + #if USE_SSL gtk_widget_set_sensitive(ssl.receive_frame, TRUE); gtk_widget_set_sensitive(ssl.pop_chkbtn, TRUE); diff --git a/src/prefs_common.c b/src/prefs_common.c index df12f4541..41af5078d 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -2230,6 +2230,9 @@ static void prefs_display_create(void) PACK_CHECK_BUTTON (vbox2, chkbtn_display_img, _("Automatically display images")); + + 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, TRUE, 0); diff --git a/src/summaryview.c b/src/summaryview.c index d905e594d..62f5009ed 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -1694,6 +1694,7 @@ static void summary_update_status(SummaryView *summaryview) node != NULL; node = gtkut_ctree_node_next(ctree, node)) { msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node); +//XXX:tm crash after filter/move (msgingo==NULL) if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) summaryview->newmsgs++; if (MSG_IS_UNREAD(msginfo->flags)&& !MSG_IS_IGNORE_THREAD(msginfo->flags)) -- 2.11.4.GIT