Sync with 1.7.6.6

* maint-1.7.8:
  Git 1.7.6.6
  imap-send: remove dead code
This commit is contained in:
Junio C Hamano 2012-02-05 23:53:21 -08:00
commit cc811d8d02
2 changed files with 2 additions and 24 deletions

View File

@ -69,9 +69,10 @@ Documentation for older releases are available here:
link:RelNotes/1.7.7.1.txt[1.7.7.1],
link:RelNotes/1.7.7.txt[1.7.7].
* link:v1.7.6.5/git.html[documentation for release 1.7.6.5]
* link:v1.7.6.6/git.html[documentation for release 1.7.6.6]
* release notes for
link:RelNotes/1.7.6.6.txt[1.7.6.6],
link:RelNotes/1.7.6.5.txt[1.7.6.5],
link:RelNotes/1.7.6.4.txt[1.7.6.4],
link:RelNotes/1.7.6.3.txt[1.7.6.3],

View File

@ -42,28 +42,6 @@ struct store_conf {
unsigned trash_remote_new:1, trash_only_new:1;
};
struct string_list {
struct string_list *next;
char string[1];
};
struct channel_conf {
struct channel_conf *next;
char *name;
struct store_conf *master, *slave;
char *master_name, *slave_name;
char *sync_state;
struct string_list *patterns;
int mops, sops;
unsigned max_messages; /* for slave only */
};
struct group_conf {
struct group_conf *next;
char *name;
struct string_list *channels;
};
/* For message->status */
#define M_RECENT (1<<0) /* unsyncable flag; maildir_* depend on this being 1<<0 */
#define M_DEAD (1<<1) /* expunged */
@ -71,7 +49,6 @@ struct group_conf {
struct message {
struct message *next;
/* struct string_list *keywords; */
size_t size; /* zero implies "not fetched" */
int uid;
unsigned char flags, status;