Skip to content

Commit

Permalink
Sync with 1.7.6.6
Browse files Browse the repository at this point in the history
* maint-1.7.7:
  Git 1.7.6.6
  imap-send: remove dead code
  • Loading branch information
Junio C Hamano committed Feb 6, 2012
2 parents c572f49 + 110c511 commit d0482e8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 24 deletions.
3 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,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],
Expand Down
23 changes: 0 additions & 23 deletions imap-send.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,36 +41,13 @@ 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 */
#define M_FLAGS (1<<2) /* flags fetched */

struct message {
struct message *next;
/* struct string_list *keywords; */
size_t size; /* zero implies "not fetched" */
int uid;
unsigned char flags, status;
Expand Down

0 comments on commit d0482e8

Please sign in to comment.