refreshed sidebar patch, readded it to mutt-patched, re-enabled the build of mutt...

[software/mutt-debian.git] / imap / browse.c

diff --git a/imap/browse.c b/imap/browse.c
index 750a65dacc1ba0f7f7fd1bbdcb03302541b1f575..0262e2fca3275486dec7f0ccda1871e8befe6dd8 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1996-9 Brandon Long <blong@fiction.net>
- * Copyright (C) 1999-2007 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 1999-2008 Brendan Cully <brendan@kublai.com>
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -228,7 +228,7 @@ int imap_mailbox_state (const char* path, struct mailbox_state* state)
     return -1;
   }
 
-  if (!imap_mxcmp(mx.mbox, idata->mailbox))
+  if (idata->ctx && !imap_mxcmp(mx.mbox, idata->mailbox))
   {
     state->new = idata->ctx->new;
     state->messages = idata->ctx->msgcount;
@@ -239,6 +239,8 @@ int imap_mailbox_state (const char* path, struct mailbox_state* state)
     state->messages = status->messages;
   }
 
+  FREE (&mx.mbox);
+
   return 0;
 }
 
@@ -329,7 +331,9 @@ int imap_mailbox_rename(const char* mailbox)
     goto fail;
   }
 
-  if (imap_rename_mailbox (idata, &mx, newname) < 0) {
+  imap_fix_path (idata, newname, buf, sizeof (buf));
+
+  if (imap_rename_mailbox (idata, &mx, buf) < 0) {
     mutt_error (_("Rename failed: %s"), imap_get_qualifier (idata->buf));
     mutt_sleep (1);
     goto fail;