X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/6918361d84c231c8cfb60bcf3b7b8d86db18126d..26cfb9f120b0958f106aacbf90c8ca3d08077f0d:/debian/patches/features/trash-folder?ds=sidebyside

diff --git a/debian/patches/features/trash-folder b/debian/patches/features/trash-folder
index 1167afc..b871175 100644
--- a/debian/patches/features/trash-folder
+++ b/debian/patches/features/trash-folder
@@ -46,11 +46,11 @@ To sum up, it's more integrated and transparent to the user.
   - Fixed indentation of "appended" in mutt.h.
 
 == END PATCH
-Index: debian-mutt/commands.c
+Index: mutt/commands.c
 ===================================================================
---- debian-mutt.orig/commands.c	2007-04-12 19:06:45.000000000 +0200
-+++ debian-mutt/commands.c	2007-05-16 23:09:20.000000000 +0200
-@@ -688,6 +688,7 @@ int _mutt_save_message (HEADER *h, CONTE
+--- mutt.orig/commands.c	2009-06-25 12:35:37.000000000 +0200
++++ mutt/commands.c	2009-06-25 12:35:48.000000000 +0200
+@@ -716,6 +716,7 @@
      if (option (OPTDELETEUNTAG))
        mutt_set_flag (Context, h, M_TAG, 0);
    }
@@ -58,11 +58,11 @@ Index: debian-mutt/commands.c
    
    return 0;
  }
-Index: debian-mutt/flags.c
+Index: mutt/flags.c
 ===================================================================
---- debian-mutt.orig/flags.c	2007-05-16 23:08:46.000000000 +0200
-+++ debian-mutt/flags.c	2007-05-16 23:43:45.000000000 +0200
-@@ -69,7 +69,13 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
+--- mutt.orig/flags.c	2009-06-25 12:35:37.000000000 +0200
++++ mutt/flags.c	2009-06-25 12:35:48.000000000 +0200
+@@ -65,7 +65,13 @@
        {
  	h->deleted = 0;
          update = 1;
@@ -77,7 +77,7 @@ Index: debian-mutt/flags.c
  #ifdef USE_IMAP
          /* see my comment above */
  	if (ctx->magic == M_IMAP) 
-@@ -91,6 +97,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
+@@ -87,6 +93,17 @@
        }
        break;
  
@@ -95,11 +95,11 @@ Index: debian-mutt/flags.c
      case M_NEW:
  
        if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
-Index: debian-mutt/globals.h
+Index: mutt/globals.h
 ===================================================================
---- debian-mutt.orig/globals.h	2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/globals.h	2007-05-16 23:09:20.000000000 +0200
-@@ -142,6 +142,7 @@ WHERE char *StChars;
+--- mutt.orig/globals.h	2009-06-25 12:35:44.000000000 +0200
++++ mutt/globals.h	2009-06-25 12:35:48.000000000 +0200
+@@ -139,6 +139,7 @@
  WHERE char *Status;
  WHERE char *Tempdir;
  WHERE char *Tochars;
@@ -107,11 +107,11 @@ Index: debian-mutt/globals.h
  WHERE char *Username;
  WHERE char *Visual;
  WHERE char *XtermTitle;
-Index: debian-mutt/imap/message.c
+Index: mutt/imap/message.c
 ===================================================================
---- debian-mutt.orig/imap/message.c	2007-05-16 23:08:46.000000000 +0200
-+++ debian-mutt/imap/message.c	2007-05-16 23:09:20.000000000 +0200
-@@ -816,6 +816,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
+--- mutt.orig/imap/message.c	2009-06-25 12:35:37.000000000 +0200
++++ mutt/imap/message.c	2009-06-25 12:35:48.000000000 +0200
+@@ -867,6 +867,7 @@
          if (ctx->hdrs[n]->tagged)
          {
            mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1);
@@ -119,7 +119,7 @@ Index: debian-mutt/imap/message.c
            if (option (OPTDELETEUNTAG))
              mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0);
          }
-@@ -823,6 +824,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
+@@ -874,6 +875,7 @@
      else
      {
        mutt_set_flag (ctx, h, M_DELETE, 1);
@@ -127,13 +127,13 @@ Index: debian-mutt/imap/message.c
        if (option (OPTDELETEUNTAG))
          mutt_set_flag (ctx, h, M_TAG, 0);
      }
-Index: debian-mutt/init.h
+Index: mutt/init.h
 ===================================================================
---- debian-mutt.orig/init.h	2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/init.h	2007-05-16 23:09:20.000000000 +0200
-@@ -2873,6 +2873,16 @@ struct option_t MuttVars[] = {
+--- mutt.orig/init.h	2009-06-25 12:35:44.000000000 +0200
++++ mutt/init.h	2009-06-25 12:35:48.000000000 +0200
+@@ -3180,6 +3180,16 @@
    ** by \fIyou\fP.  The sixth character is used to indicate when a mail
-   ** was sent to a mailing-list you subscribe to (default: L).
+   ** was sent to a mailing-list you subscribe to.
    */
 +  { "trash",		DT_PATH, R_NONE, UL &TrashPath, 0 },
 +  /*
@@ -148,11 +148,11 @@ Index: debian-mutt/init.h
  #ifdef USE_SOCKET
    { "tunnel",            DT_STR, R_NONE, UL &Tunnel, UL 0 },
    /*
-Index: debian-mutt/mutt.h
+Index: mutt/mutt.h
 ===================================================================
---- debian-mutt.orig/mutt.h	2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/mutt.h	2007-05-16 23:09:20.000000000 +0200
-@@ -206,6 +206,7 @@ enum
+--- mutt.orig/mutt.h	2009-06-25 12:35:44.000000000 +0200
++++ mutt/mutt.h	2009-06-25 12:35:48.000000000 +0200
+@@ -187,6 +187,7 @@
    M_DELETE,
    M_UNDELETE,
    M_DELETED,
@@ -160,7 +160,7 @@ Index: debian-mutt/mutt.h
    M_FLAG,
    M_TAG,
    M_UNTAG,
-@@ -718,6 +719,7 @@ typedef struct header
+@@ -702,6 +703,7 @@
    unsigned int mime : 1;    		/* has a MIME-Version header? */
    unsigned int flagged : 1; 		/* marked important? */
    unsigned int tagged : 1;
@@ -168,7 +168,7 @@ Index: debian-mutt/mutt.h
    unsigned int deleted : 1;
    unsigned int changed : 1;
    unsigned int attach_del : 1; 		/* has an attachment marked for deletion */
-@@ -889,6 +891,7 @@ typedef struct _context
+@@ -874,6 +876,7 @@
    int new;			/* how many new messages? */
    int unread;			/* how many unread messages? */
    int deleted;			/* how many deleted messages */
@@ -176,11 +176,11 @@ Index: debian-mutt/mutt.h
    int flagged;			/* how many flagged messages */
    int msgnotreadyet;		/* which msg "new" in pager, -1 if none */
  
-Index: debian-mutt/muttlib.c
+Index: mutt/muttlib.c
 ===================================================================
---- debian-mutt.orig/muttlib.c	2007-05-16 23:08:47.000000000 +0200
-+++ debian-mutt/muttlib.c	2007-05-16 23:09:20.000000000 +0200
-@@ -1384,7 +1384,9 @@ int mutt_save_confirm (const char *s, st
+--- mutt.orig/muttlib.c	2009-06-25 12:35:37.000000000 +0200
++++ mutt/muttlib.c	2009-06-25 12:35:48.000000000 +0200
+@@ -1460,7 +1460,9 @@
  
    if (magic > 0 && !mx_access (s, W_OK))
    {
@@ -191,11 +191,11 @@ Index: debian-mutt/muttlib.c
      {
        snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
        if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
-Index: debian-mutt/mx.c
+Index: mutt/mx.c
 ===================================================================
---- debian-mutt.orig/mx.c	2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/mx.c	2007-05-16 23:09:20.000000000 +0200
-@@ -838,6 +838,53 @@ static int sync_mailbox (CONTEXT *ctx, i
+--- mutt.orig/mx.c	2009-06-25 12:35:37.000000000 +0200
++++ mutt/mx.c	2009-06-25 12:35:48.000000000 +0200
+@@ -773,6 +773,53 @@
    return rc;
  }
  
@@ -249,7 +249,7 @@ Index: debian-mutt/mx.c
  /* save changes and close mailbox */
  int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
  {
-@@ -973,6 +1020,7 @@ int mx_close_mailbox (CONTEXT *ctx, int 
+@@ -909,6 +956,7 @@
  	  if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0)
  	  {
  	    mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1);
@@ -257,12 +257,12 @@ Index: debian-mutt/mx.c
  	  }
  	  else
  	  {
-@@ -994,6 +1042,14 @@ int mx_close_mailbox (CONTEXT *ctx, int 
+@@ -931,6 +979,14 @@
      return 0;
    }
    
 +  /* copy mails to the trash before expunging */
-+  if (purge && ctx->deleted)
++  if (purge && ctx->deleted && mutt_strcmp(ctx->path, TrashPath))
 +    if (trash_append (ctx) != 0)
 +    {
 +      ctx->closing = 0;
@@ -272,24 +272,24 @@ Index: debian-mutt/mx.c
  #ifdef USE_IMAP
    /* allow IMAP to preserve the deleted flag across sessions */
    if (ctx->magic == M_IMAP)
-@@ -1194,6 +1250,12 @@ int mx_sync_mailbox (CONTEXT *ctx, int *
+@@ -1130,6 +1186,12 @@
    msgcount = ctx->msgcount;
    deleted = ctx->deleted;
  
-+  if (purge && ctx->deleted)
++  if (purge && ctx->deleted && mutt_strcmp(ctx->path, TrashPath))
 +  {
 +    if (trash_append (ctx) == -1)
 +      return -1;
-+  } 
++  }
 +
  #ifdef USE_IMAP
    if (ctx->magic == M_IMAP)
      rc = imap_sync_mailbox (ctx, purge, index_hint);
-Index: debian-mutt/postpone.c
+Index: mutt/postpone.c
 ===================================================================
---- debian-mutt.orig/postpone.c	2007-04-12 19:06:45.000000000 +0200
-+++ debian-mutt/postpone.c	2007-05-16 23:09:20.000000000 +0200
-@@ -279,6 +279,9 @@ int mutt_get_postponed (CONTEXT *ctx, HE
+--- mutt.orig/postpone.c	2009-06-25 12:35:37.000000000 +0200
++++ mutt/postpone.c	2009-06-25 12:35:48.000000000 +0200
+@@ -276,6 +276,9 @@
    /* finished with this message, so delete it. */
    mutt_set_flag (PostContext, h, M_DELETE, 1);
  
@@ -299,12 +299,3 @@ Index: debian-mutt/postpone.c
    /* update the count for the status display */
    PostCount = PostContext->msgcount - PostContext->deleted;
  
-Index: debian-mutt/PATCHES
-===================================================================
---- debian-mutt.orig/PATCHES	2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/PATCHES	2007-05-16 23:09:20.000000000 +0200
-@@ -1,3 +1,4 @@
-+patch-1.5.13.cd.trash_folder.3.4
- patch-1.5.13.nt+ab.xtitles.4
- patch-1.5.6.dw.maildir-mtime.1
- patch-1.5.13.cd.ifdef.2