From 158f316267ae248b3ad36d8df83691168377d2cf Mon Sep 17 00:00:00 2001
From: jgoerzen <jgoerzen>
Date: Tue, 16 Jul 2002 23:36:33 +0100
Subject: [PATCH] /head: changeset 124

Fixed remotepassfile
---
 head/debian/changelog       |  9 +++++++++
 head/offlineimap.py         | 14 ++++----------
 head/offlineimap/version.py |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/head/debian/changelog b/head/debian/changelog
index f5c69f3..c6ce54a 100644
--- a/head/debian/changelog
+++ b/head/debian/changelog
@@ -1,3 +1,12 @@
+offlineimap (3.0.2) unstable; urgency=low
+
+  * Fixed mailbox name recorder to use localfolder.getvisiblename() rather
+    than remotefolder.getvisiblename()
+  * Fixed remotepassfile option.  Closes: #153119.  Used 1-line patch from
+    Tommi Virtanen.
+
+ -- John Goerzen <jgoerzen@complete.org>  Mon, 15 Jul 2002 19:43:36 -0500
+
 offlineimap (3.0.1) unstable; urgency=low
 
   * Detabified the source.
diff --git a/head/offlineimap.py b/head/offlineimap.py
index d5bc653..491f8aa 100644
--- a/head/offlineimap.py
+++ b/head/offlineimap.py
@@ -90,7 +90,7 @@ for account in accounts:
     elif config.has_option(account, "remotepass"):
         passwords[account] = config.get(account, "remotepass")
     elif config.has_option(account, "remotepassfile"):
-        passfile = os.path.expanduser(config.get(account, "remotepassfile"))
+        passfile = open(os.path.expanduser(config.get(account, "remotepassfile")))
         passwords[account] = passfile.readline().strip()
         passfile.close()
     else:
@@ -103,15 +103,8 @@ for account in accounts:
                                          config.getint(account, "maxconnections"))
 
 mailboxes = []
-mailboxlock = Lock()
 servers = {}
 
-def addmailbox(accountname, remotefolder):
-    mailboxlock.acquire()
-    mailboxes.append({'accountname' : accountname,
-                      'foldername': remotefolder.getvisiblename()})
-    mailboxlock.release()    
-    
 def syncaccount(accountname, *args):
     # We don't need an account lock because syncitall() goes through
     # each account once, then waits for all to finish.
@@ -160,12 +153,13 @@ def syncaccount(accountname, *args):
 
 def syncfolder(accountname, remoterepos, remotefolder, localrepos,
                statusrepos):
-    mailboxes.append({'accountname': accountname,
-                      'foldername': remotefolder.getvisiblename()})
     # Load local folder.
     localfolder = localrepos.\
                   getfolder(remotefolder.getvisiblename().\
                             replace(remoterepos.getsep(), localrepos.getsep()))
+    # Write the mailboxes
+    mailboxes.append({'accountname': accountname,
+                      'foldername': localfolder.getvisiblename()})
     # Load local folder
     ui.syncingfolder(remoterepos, remotefolder, localrepos, localfolder)
     ui.loadmessagelist(localrepos, localfolder)
diff --git a/head/offlineimap/version.py b/head/offlineimap/version.py
index b6a9639..25e476b 100644
--- a/head/offlineimap/version.py
+++ b/head/offlineimap/version.py
@@ -1,5 +1,5 @@
 productname = 'OfflineIMAP'
-versionstr = "3.0.1"
+versionstr = "3.0.2"
 
 versionlist = versionstr.split(".")
 major = versionlist[0]