diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-02-06 11:52:53 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-06 11:52:53 +0400 |
commit | d0482e88a735787f7bb33ef4783be0e7f6a70946 (patch) | |
tree | dd49e820e961a0e2f3fe522c7c0a91dff896543c | |
parent | c572f491e545f3fe76a966e418139fc9755a910f (diff) | |
parent | 110c511dbeff65f7ae92216cf1d976a9093d911f (diff) |
Sync with 1.7.6.6
* maint-1.7.7:
Git 1.7.6.6
imap-send: remove dead code
-rw-r--r-- | Documentation/git.txt | 3 | ||||
-rw-r--r-- | imap-send.c | 23 |
2 files changed, 2 insertions, 24 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index db5d5570cf..614693a83f 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -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], diff --git a/imap-send.c b/imap-send.c index 80e0e8c051..12e8318dc6 100644 --- a/imap-send.c +++ b/imap-send.c @@ -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; |