Sync with 1.7.6.6

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

View File

@ -41,28 +41,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 */
@ -70,7 +48,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;