gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2004-12-08 [colin] 0.9.13cvs7.1

Browse source 
* src/matcher_parser_parse.y
	* src/msgcache.c
	* src/prefs_matcher.c
	* src/procheader.c
	* src/matcher.c
	* src/common/defs.h
	* po/sr.po
		Sync with HEAD
This commit is contained in:
Colin Leroy 2004-12-08 11:31:25 +00:00
parent 819946453e
commit 339ad720d3
10 changed files with 1967 additions and 1844 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog-gtk2.claws
View file

@ -1,3 +1,14 @@
2004-12-08 [colin] 0.9.13cvs7.1
* src/matcher_parser_parse.y
* src/msgcache.c
* src/prefs_matcher.c
* src/procheader.c
* src/matcher.c
* src/common/defs.h
* po/sr.po
Sync with HEAD
2004-12-08 [colin] 0.9.13cvs6.1
* src/quote_fmt_parse.y

1
PATCHSETS
View file

@ -280,3 +280,4 @@
( cvs diff -u -r 1.2504.2.37 -r 1.2504.2.38 ChangeLog.claws; cvs diff -u -r 1.100.2.6 -r 1.100.2.7 AUTHORS; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 po/sk.po; cvs diff -u -r 1.49.2.25 -r 1.49.2.26 src/procmime.c; cvs diff -u -r 1.105.2.14 -r 1.105.2.15 src/prefs_account.c; cvs diff -u -r 1.11.2.6 -r 1.11.2.7 src/common/smtp.c; cvs diff -u -r 1.6.2.3 -r 1.6.2.4 src/common/smtp.h; ) > 0.9.13cvs2.1.patchset
( cvs diff -u -r 1.49.2.26 -r 1.49.2.27 src/procmime.c; ) > 0.9.13cvs2.2.patchset
( cvs diff -u -r 1.22.2.3 -r 1.22.2.4 src/quote_fmt_parse.y; cvs diff -u -r 1.96.2.36 -r 1.96.2.37 src/textview.c; cvs diff -u -r 1.12.2.9 -r 1.12.2.10 src/gtk/prefswindow.c; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/gtk/pluginwindow.c; ) > 0.9.13cvs6.1.patchset
( cvs diff -u -r 1.25.2.6 -r 1.25.2.7 src/matcher_parser_parse.y; cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/msgcache.c; cvs diff -u -r 1.43.2.10 -r 1.43.2.11 src/prefs_matcher.c; cvs diff -u -r 1.47.2.11 -r 1.47.2.12 src/procheader.c; cvs diff -u -r 1.75.2.3 -r 1.75.2.4 src/matcher.c; cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/common/defs.h; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 po/sr.po; ) > 0.9.13cvs7.1.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=13
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=6
EXTRA_VERSION=7
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=.1

3753
po/sr.po
View file

File diff suppressed because it is too large Load diff

2
src/common/defs.h
View file

@ -77,7 +77,7 @@
#define FOLDER_LIST "folderlist.xml"
#define CACHE_FILE ".sylpheed_cache"
#define MARK_FILE ".sylpheed_mark"
#define CACHE_VERSION 22
#define CACHE_VERSION 23
#define MARK_VERSION 2
#define DEFAULT_SIGNATURE ".signature"

16
src/matcher.c
View file

@ -492,6 +492,12 @@ gboolean matcherprop_match(MatcherProp *prop,
case MATCHCRITERIA_SIZE_SMALLER:
/* FIXME: info->size is an off_t */
return info->size < (off_t) prop->value;
case MATCHCRITERIA_PARTIAL:
/* FIXME: info->size is an off_t */
return (info->total_size != 0 && info->size != (off_t)info->total_size);
case MATCHCRITERIA_NOT_PARTIAL:
/* FIXME: info->size is an off_t */
return (info->total_size == 0 || info->size == (off_t)info->total_size);
case MATCHCRITERIA_NEWSGROUPS:
return matcherprop_string_match(prop, info->newsgroups);
case MATCHCRITERIA_NOT_NEWSGROUPS:
@ -603,10 +609,6 @@ static gboolean matcherprop_match_one_header(MatcherProp *matcher,
case MATCHCRITERIA_NOT_MESSAGE:
case MATCHCRITERIA_NOT_HEADERS_PART:
return !matcherprop_string_match(matcher, buf);
case MATCHCRITERIA_PARTIAL:
return matcherprop_string_match(matcher, buf);
case MATCHCRITERIA_NOT_PARTIAL:
return !matcherprop_string_match(matcher, buf);
}
return FALSE;
}
@ -627,8 +629,6 @@ static gboolean matcherprop_criteria_headers(const MatcherProp *matcher)
case MATCHCRITERIA_NOT_HEADER:
case MATCHCRITERIA_HEADERS_PART:
case MATCHCRITERIA_NOT_HEADERS_PART:
case MATCHCRITERIA_PARTIAL:
case MATCHCRITERIA_NOT_PARTIAL:
return TRUE;
default:
return FALSE;
@ -963,6 +963,8 @@ gboolean matcherlist_match(MatcherList *matchers, MsgInfo *info)
case MATCHCRITERIA_SIZE_EQUAL:
case MATCHCRITERIA_TEST:
case MATCHCRITERIA_NOT_TEST:
case MATCHCRITERIA_PARTIAL:
case MATCHCRITERIA_NOT_PARTIAL:
if (matcherprop_match(matcher, info)) {
if (!matchers->bool_and) {
return TRUE;
@ -1102,6 +1104,8 @@ gchar *matcherprop_to_string(MatcherProp *matcher)
case MATCHCRITERIA_NOT_FORWARDED:
case MATCHCRITERIA_LOCKED:
case MATCHCRITERIA_NOT_LOCKED:
case MATCHCRITERIA_PARTIAL:
case MATCHCRITERIA_NOT_PARTIAL:
case MATCHCRITERIA_IGNORE_THREAD:
case MATCHCRITERIA_NOT_IGNORE_THREAD:
return g_strdup(criteria_str);

4
src/matcher_parser_parse.y
View file

@ -548,14 +548,14 @@ MATCHER_ALL
gint criteria = 0;
criteria = MATCHCRITERIA_PARTIAL;
prop = matcherprop_new(criteria, NULL, MATCHTYPE_MATCH, "SC-Partially-Retrieved", 0);
prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NOT_PARTIAL
{
gint criteria = 0;
criteria = MATCHCRITERIA_NOT_PARTIAL;
prop = matcherprop_new(criteria, NULL, MATCHTYPE_MATCH, "SC-Partially-Retrieved", 0);
prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_COLORLABEL MATCHER_INTEGER
{

2
src/msgcache.c
View file

@ -475,6 +475,7 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
READ_CACHE_DATA(msginfo->references, fp);
READ_CACHE_DATA(msginfo->xref, fp);
READ_CACHE_DATA_INT(msginfo->planned_download, fp);
READ_CACHE_DATA_INT(msginfo->total_size, fp);
msginfo->folder = item;
msginfo->flags.tmp_flags |= tmp_flags;
@ -552,6 +553,7 @@ void msgcache_write_cache(MsgInfo *msginfo, FILE *fp)
WRITE_CACHE_DATA(msginfo->references, fp);
WRITE_CACHE_DATA(msginfo->xref, fp);
WRITE_CACHE_DATA_INT(msginfo->planned_download, fp);
WRITE_CACHE_DATA_INT(msginfo->total_size, fp);
}
static void msgcache_write_flags(MsgInfo *msginfo, FILE *fp)

3
src/prefs_matcher.c
View file

@ -158,7 +158,8 @@ static const gchar *criteria_text [] = {
N_("Test"),
N_("Size greater than"),
N_("Size smaller than"),
N_("Size exactly")
N_("Size exactly"),
N_("Partially downloaded")
};
/*!

17
src/procheader.c
View file

@ -516,13 +516,13 @@ enum
H_X_STATUS = 12,
H_FROM_SPACE = 13,
H_SC_PLANNED_DOWNLOAD = 14,
H_X_FACE = 15,
H_DISPOSITION_NOTIFICATION_TO = 16,
H_RETURN_RECEIPT_TO = 17,
H_SC_PARTIALLY_RETRIEVED = 18,
H_SC_ACCOUNT_SERVER = 19,
H_SC_ACCOUNT_LOGIN = 20,
H_SC_MESSAGE_SIZE = 21
H_SC_MESSAGE_SIZE = 15,
H_X_FACE = 16,
H_DISPOSITION_NOTIFICATION_TO = 17,
H_RETURN_RECEIPT_TO = 18,
H_SC_PARTIALLY_RETRIEVED = 19,
H_SC_ACCOUNT_SERVER = 20,
H_SC_ACCOUNT_LOGIN = 21,
};
static HeaderEntry hentry_full[] = {{"Date:", NULL, FALSE},
@ -540,13 +540,13 @@ static HeaderEntry hentry_full[] = {{"Date:", NULL, FALSE},
{"X-Status:", NULL, FALSE},
{"From ", NULL, FALSE},
{"SC-Marked-For-Download:", NULL, FALSE},
{"SC-Message-Size:", NULL, FALSE},
{"X-Face:", NULL, FALSE},
{"Disposition-Notification-To:", NULL, FALSE},
{"Return-Receipt-To:", NULL, FALSE},
{"SC-Partially-Retrieved:", NULL, FALSE},
{"SC-Account-Server:", NULL, FALSE},
{"SC-Account-Login:",NULL, FALSE},
{"SC-Message-Size:", NULL, FALSE},
{NULL, NULL, FALSE}};
static HeaderEntry hentry_short[] = {{"Date:", NULL, FALSE},
@ -564,6 +564,7 @@ static HeaderEntry hentry_short[] = {{"Date:", NULL, FALSE},
{"X-Status:", NULL, FALSE},
{"From ", NULL, FALSE},
{"SC-Marked-For-Download:", NULL, FALSE},
{"SC-Message-Size:",NULL, FALSE},
{NULL, NULL, FALSE}};
HeaderEntry* procheader_get_headernames(gboolean full)