Revision 2078
| libsylph/mbox.c (revision 2078) | ||
|---|---|---|
| 1 | 1 |
/* |
| 2 | 2 |
* LibSylph -- E-Mail client library |
| 3 |
* Copyright (C) 1999-2007 Hiroyuki Yamamoto
|
|
| 3 |
* Copyright (C) 1999-2008 Hiroyuki Yamamoto
|
|
| 4 | 4 |
* |
| 5 | 5 |
* This library is free software; you can redistribute it and/or |
| 6 | 6 |
* modify it under the terms of the GNU Lesser General Public |
| ... | ... | |
| 113 | 113 |
gchar *startp, *endp, *rpath; |
| 114 | 114 |
gint empty_line; |
| 115 | 115 |
gboolean is_next_msg = FALSE; |
| 116 |
gboolean is_junk = FALSE; |
|
| 116 | 117 |
FilterInfo *fltinfo; |
| 117 | 118 |
|
| 118 | 119 |
if ((tmp_fp = g_fopen(tmp_file, "wb")) == NULL) {
|
| ... | ... | |
| 218 | 219 |
prefs_common.filter_junk_before) {
|
| 219 | 220 |
filter_apply(prefs_common.junk_fltlist, tmp_file, |
| 220 | 221 |
fltinfo); |
| 222 |
if (fltinfo->drop_done) |
|
| 223 |
is_junk = TRUE; |
|
| 221 | 224 |
} |
| 222 | 225 |
|
| 223 | 226 |
if (!fltinfo->drop_done && apply_filter) |
| ... | ... | |
| 228 | 231 |
!prefs_common.filter_junk_before) {
|
| 229 | 232 |
filter_apply(prefs_common.junk_fltlist, tmp_file, |
| 230 | 233 |
fltinfo); |
| 234 |
if (fltinfo->drop_done) |
|
| 235 |
is_junk = TRUE; |
|
| 231 | 236 |
} |
| 232 | 237 |
|
| 233 | 238 |
if (fltinfo->actions[FLT_ACTION_MOVE] == FALSE && |
| ... | ... | |
| 262 | 267 |
} |
| 263 | 268 |
} |
| 264 | 269 |
|
| 270 |
if (!is_junk && |
|
| 271 |
fltinfo->actions[FLT_ACTION_DELETE] == FALSE && |
|
| 272 |
fltinfo->actions[FLT_ACTION_MARK_READ] == FALSE) |
|
| 273 |
msgs++; |
|
| 274 |
|
|
| 265 | 275 |
filter_info_free(fltinfo); |
| 266 | 276 |
g_unlink(tmp_file); |
| 267 |
|
|
| 268 |
msgs++; |
|
| 269 | 277 |
} while (from_line[0] != '\0'); |
| 270 | 278 |
|
| 271 | 279 |
g_free(tmp_file); |
| 272 | 280 |
fclose(mbox_fp); |
| 273 |
debug_print(_("%d messages found.\n"), msgs);
|
|
| 281 |
debug_print("%d new messages found.\n", msgs);
|
|
| 274 | 282 |
|
| 275 | 283 |
return msgs; |
| 276 | 284 |
} |
| ChangeLog.ja (revision 2078) | ||
|---|---|---|
| 1 | 1 |
2008-11-25 |
| 2 | 2 |
|
| 3 |
* libsylph/mbox.c: proc_mbox_full(): ?????ǥ?롦????????̤?ɤ? |
|
| 4 |
???å??????Τߥ??????Ȥ????褦?ˤ???(Otinov Sergey ???? thanks)?? |
|
| 5 |
|
|
| 6 |
2008-11-25 |
|
| 7 |
|
|
| 3 | 8 |
* src/foldersel.[ch] |
| 4 | 9 |
src/summaryview.c |
| 5 | 10 |
src/mainwindow.c: ?ե????????????????????˥??å????????٥????ɲá? |
| ChangeLog (revision 2078) | ||
|---|---|---|
| 1 | 1 |
2008-11-25 |
| 2 | 2 |
|
| 3 |
* libsylph/mbox.c: proc_mbox_full(): only count for non-junk and |
|
| 4 |
not-deleted and not-marked-as-read messages (thanks to Otinov |
|
| 5 |
Sergey). |
|
| 6 |
|
|
| 7 |
2008-11-25 |
|
| 8 |
|
|
| 3 | 9 |
* src/foldersel.[ch] |
| 4 | 10 |
src/summaryview.c |
| 5 | 11 |
src/mainwindow.c: added message label to the folder selection |
Also available in: Unified diff