Merge branch '531430+imapuser'

[software/mutt-debian.git] / debian / patches / mutt-patched / sidebar

diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar
index dafdf928562ee9367b9d25b7bfc52e7cebde7549..c719c2c5f9372cb2d2fe24a85fb2069e0723ce1b 100644 (file)
--- a/debian/patches/mutt-patched/sidebar
+++ b/debian/patches/mutt-patched/sidebar
@@ -772,7 +772,7 @@ in the "mutt-patched" package.
        else if (ch == '|')
 --- a/mx.c
 +++ b/mx.c
        else if (ch == '|')
 --- a/mx.c
 +++ b/mx.c

-@@ -596,6 +596,7 @@
+@@ -595,6 +595,7 @@

   *            M_APPEND        open mailbox for appending
   *            M_READONLY      open mailbox in read-only mode
   *            M_QUIET         only print error messages
   *            M_APPEND        open mailbox for appending
   *            M_READONLY      open mailbox in read-only mode
   *            M_QUIET         only print error messages


@@ -780,7 +780,7 @@ in the "mutt-patched" package.
   *    ctx     if non-null, context struct to use
   */
  CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
   *    ctx     if non-null, context struct to use
   */
  CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)

-@@ -618,6 +619,8 @@
+@@ -617,6 +618,8 @@

      ctx->quiet = 1;
    if (flags & M_READONLY)
      ctx->readonly = 1;
      ctx->quiet = 1;
    if (flags & M_READONLY)
      ctx->readonly = 1;


@@ -789,7 +789,7 @@ in the "mutt-patched" package.
  
    if (flags & (M_APPEND|M_NEWFOLDER))
    {
  
    if (flags & (M_APPEND|M_NEWFOLDER))
    {

-@@ -722,9 +725,21 @@
+@@ -721,9 +724,21 @@

  void mx_fastclose_mailbox (CONTEXT *ctx)
  {
    int i;
  void mx_fastclose_mailbox (CONTEXT *ctx)
  {
    int i;


@@ -1360,9 +1360,3 @@ in the "mutt-patched" package.
          FREE (&value);
          return;
        }
          FREE (&value);
          return;
        }

---- a/PATCHES
-+++ b/PATCHES
-@@ -1,2 +1,3 @@
-+patch-1.5.19.sidebar.20090522.txt
- patch-1.5.18.rr.compressed.1
- patch-1.5.13.cd.ifdef.2