From 9ff504187b216ac1f00d4316874ac8aadcd6c041 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 11 Jul 2005 18:12:53 +0000 Subject: [PATCH] 2005-07-11 [colin] 1.9.12cvs36 * src/inc.c Add visual indication that filtering is running * src/textview.c Make {}[] uri delimiters * src/summaryview.c Remove useless (and slow) calls --- ChangeLog-gtk2.claws | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/inc.c | 16 +++++++++++++++- src/summaryview.c | 3 --- src/textview.c | 2 +- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 46cdfe3c9..b4aa38ef7 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,12 @@ +2005-07-11 [colin] 1.9.12cvs36 + + * src/inc.c + Add visual indication that filtering is running + * src/textview.c + Make {}[] uri delimiters + * src/summaryview.c + Remove useless (and slow) calls + 2005-07-11 [paul] 1.9.12cvs35 * src/plugins/clamav/clamav_plugin_gtk.c diff --git a/PATCHSETS b/PATCHSETS index 7f3a95fcf..76b03c89f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -630,3 +630,4 @@ ( cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/etpan/imap-thread.c; ) > 1.9.12cvs33.patchset ( cvs diff -u -r 1.61.2.28 -r 1.61.2.29 src/account.c; cvs diff -u -r 1.5.12.3 -r 1.5.12.4 src/editjpilot.c; cvs diff -u -r 1.5.12.3 -r 1.5.12.4 src/editvcard.c; cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/prefs_template.c; ) > 1.9.12cvs34.patchset ( cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.23.2.9 -r 1.23.2.10 src/plugins/spamassassin/spamassassin_gtk.c; ) > 1.9.12cvs35.patchset +( cvs diff -u -r 1.149.2.28 -r 1.149.2.29 src/inc.c; cvs diff -u -r 1.96.2.61 -r 1.96.2.62 src/textview.c; cvs diff -u -r 1.395.2.91 -r 1.395.2.92 src/summaryview.c; ) > 1.9.12cvs36.patchset diff --git a/configure.ac b/configure.ac index 4dc43d770..e8f7053ff 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=35 +EXTRA_VERSION=36 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/inc.c b/src/inc.c index 2413fe19a..7dac1653d 100644 --- a/src/inc.c +++ b/src/inc.c @@ -548,6 +548,7 @@ static gint inc_start(IncProgressDialog *inc_dialog) } for (; inc_dialog->queue_list != NULL && !cancelled; inc_dialog->cur_row++) { + int cur = 0, total = 0; session = inc_dialog->queue_list->data; pop3_session = POP3_SESSION(session->session); @@ -635,17 +636,30 @@ static gint inc_start(IncProgressDialog *inc_dialog) /* process messages */ folder_item_update_freeze(); - for(msglist_element = msglist; msglist_element != NULL; msglist_element = msglist_element->next) { + if (pop3_session->ac_prefs->filter_on_recv) + statusbar_print_all(_("Filtering messages...\n")); + total = g_slist_length(msglist); + + for(msglist_element = msglist; msglist_element != NULL; + msglist_element = msglist_element->next) { gchar *filename; msginfo = (MsgInfo *) msglist_element->data; filename = folder_item_fetch_msg(processing, msginfo->msgnum); g_free(filename); + + if (pop3_session->ac_prefs->filter_on_recv) + statusbar_progress_all(cur++,total, 10); + if (!pop3_session->ac_prefs->filter_on_recv || !procmsg_msginfo_filter(msginfo)) folder_item_move_msg(inbox, msginfo); procmsg_msginfo_free(msginfo); } folder_item_update_thaw(); + + statusbar_progress_all(0,0,0); + statusbar_pop_all(); + g_slist_free(msglist); statusbar_pop_all(); diff --git a/src/summaryview.c b/src/summaryview.c index 61e44a2d7..b5bf69c10 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -2764,7 +2764,6 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row) summaryview->moved--; if (MSG_IS_COPY(msginfo->flags)) summaryview->copied--; - procmsg_update_unread_children (msginfo, TRUE); procmsg_msginfo_set_to_folder(msginfo, NULL); procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY); @@ -3020,7 +3019,6 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row) summaryview->moved--; if (MSG_IS_COPY(msginfo->flags)) summaryview->copied--; - procmsg_update_unread_children (msginfo, FALSE); procmsg_msginfo_set_to_folder(msginfo, NULL); procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY); @@ -3154,7 +3152,6 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row) summaryview->moved--; if (MSG_IS_COPY(msginfo->flags)) summaryview->copied--; - procmsg_update_unread_children (msginfo, FALSE); procmsg_msginfo_set_to_folder(msginfo, NULL); procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY); diff --git a/src/textview.c b/src/textview.c index e23c607b9..bd14b88c3 100644 --- a/src/textview.c +++ b/src/textview.c @@ -836,7 +836,7 @@ static gboolean get_uri_part(const gchar *start, const gchar *scanpos, for (ep_ = scanpos; *ep_ != '\0'; ep_++) { if (!isgraph(*(const guchar *)ep_) || !IS_ASCII(*(const guchar *)ep_) || - strchr("()<>\"", *ep_)) + strchr("[]{}()<>\"", *ep_)) break; } -- 2.25.1