diff --git a/head/offlineimap.conf b/head/offlineimap.conf index fda9364..b59b9f9 100644 --- a/head/offlineimap.conf +++ b/head/offlineimap.conf @@ -22,10 +22,10 @@ [general] -# This specifies where imapsync is to store its metadata. +# This specifies where offlineimap is to store its metadata. # This directory will be created if it does not already exist. -metadata = ~/.imapsync +metadata = ~/.offlineimap # This variable specifies which accounts are defined. Separate them # with commas. Account names should be alphanumeric only. @@ -35,7 +35,7 @@ metadata = ~/.imapsync accounts = Test -# You can have imapsync continue running indefinately, automatically +# You can have offlineimap continue running indefinately, automatically # syncing your mail periodically. If you want that, specify how # frequently to do that (in minutes) here. @@ -47,7 +47,7 @@ accounts = Test [mbnames] -# imapsync can record your mailbox names in a format you specify. +# offlineimap can record your mailbox names in a format you specify. # You can define the header, each mailbox item, the separator, # and the footer. Here is an example for Mutt. # If enabled is yes, all six setting must be specified, even if they diff --git a/head/offlineimap.py b/head/offlineimap.py index b8e8d7b..1c22aa7 100644 --- a/head/offlineimap.py +++ b/head/offlineimap.py @@ -17,15 +17,15 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from imapsync import imaplib, imaputil, imapserver, repository, folder, mbnames -import re, os, os.path, imapsync, sys +from offlineimap import imaplib, imaputil, imapserver, repository, folder, mbnames +import re, os, os.path, offlineimap, sys from ConfigParser import ConfigParser -ui = imapsync.ui.TTY.TTYUI() +ui = offlineimap.ui.TTY.TTYUI() ui.init_banner() config = ConfigParser() -configfilename = os.path.expanduser("~/.imapsyncrc") +configfilename = os.path.expanduser("~/.offlineimaprc") if not os.path.exists(configfilename): sys.stderr.write(" *** Config file %s does not exist; aborting!\n" % configfilename) sys.exit(1) diff --git a/head/offlineimap/folder/IMAP.py b/head/offlineimap/folder/IMAP.py index 9e9c264..d125d11 100644 --- a/head/offlineimap/folder/IMAP.py +++ b/head/offlineimap/folder/IMAP.py @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from Base import BaseFolder -from imapsync import imaputil, imaplib +from offlineimap import imaputil, imaplib import rfc822 from StringIO import StringIO diff --git a/head/offlineimap/folder/LocalStatus.py b/head/offlineimap/folder/LocalStatus.py index 6057aaa..b8f4784 100644 --- a/head/offlineimap/folder/LocalStatus.py +++ b/head/offlineimap/folder/LocalStatus.py @@ -19,7 +19,7 @@ from Base import BaseFolder import os -magicline = "IMAPSYNC LocalStatus CACHE DATA - DO NOT MODIFY - FORMAT 1" +magicline = "OFFLINEIMAP LocalStatus CACHE DATA - DO NOT MODIFY - FORMAT 1" class LocalStatusFolder(BaseFolder): def __init__(self, root, name): diff --git a/head/offlineimap/folder/Maildir.py b/head/offlineimap/folder/Maildir.py index 84c0781..c42dc9b 100644 --- a/head/offlineimap/folder/Maildir.py +++ b/head/offlineimap/folder/Maildir.py @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from Base import BaseFolder -from imapsync import imaputil +from offlineimap import imaputil import os.path, os, re, time, socket class MaildirFolder(BaseFolder): @@ -25,7 +25,7 @@ class MaildirFolder(BaseFolder): self.name = name self.root = root self.sep = '.' - self.uidfilename = os.path.join(self.getfullname(), "imapsync.uidvalidity") + self.uidfilename = os.path.join(self.getfullname(), "offlineimap.uidvalidity") self.messagelist = None def getfullname(self): diff --git a/head/offlineimap/imapserver.py b/head/offlineimap/imapserver.py index 2f31186..1ca2687 100644 --- a/head/offlineimap/imapserver.py +++ b/head/offlineimap/imapserver.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from imapsync import imaplib, imaputil +from offlineimap import imaplib, imaputil class IMAPServer: def __init__(self, username, password, hostname, port = None, ssl = 1): diff --git a/head/offlineimap/repository/IMAP.py b/head/offlineimap/repository/IMAP.py index 255192c..e9bd66d 100644 --- a/head/offlineimap/repository/IMAP.py +++ b/head/offlineimap/repository/IMAP.py @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from Base import BaseRepository -from imapsync import folder, imaputil +from offlineimap import folder, imaputil import re class IMAPRepository(BaseRepository): diff --git a/head/offlineimap/repository/LocalStatus.py b/head/offlineimap/repository/LocalStatus.py index 15edded..5a864d8 100644 --- a/head/offlineimap/repository/LocalStatus.py +++ b/head/offlineimap/repository/LocalStatus.py @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from Base import BaseRepository -from imapsync import folder +from offlineimap import folder import os class LocalStatusRepository(BaseRepository): diff --git a/head/offlineimap/repository/Maildir.py b/head/offlineimap/repository/Maildir.py index 6ba0874..4f03b4c 100644 --- a/head/offlineimap/repository/Maildir.py +++ b/head/offlineimap/repository/Maildir.py @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from Base import BaseRepository -from imapsync import folder, imaputil +from offlineimap import folder, imaputil from mailbox import Maildir import os diff --git a/head/offlineimap/ui/UIBase.py b/head/offlineimap/ui/UIBase.py index 91373e9..d60c5a2 100644 --- a/head/offlineimap/ui/UIBase.py +++ b/head/offlineimap/ui/UIBase.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from imapsync import repository +from offlineimap import repository import re, time class UIBase: @@ -45,7 +45,7 @@ class UIBase: def init_banner(s): "Display the copyright banner." - s._msg("""imapsync + s._msg("""offlineimap Copyright (C) 2002 John Goerzen. All rights reserved. This software comes with NO WARRANTY: see the file COPYING for details.""")