[Spambayes-checkins] spambayes/spambayes ImapUI.py, 1.8, 1.9 ProxyUI.py, 1.5, 1.6

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv27384/spambayes

Modified Files:
	ImapUI.py ProxyUI.py 
Log Message:
Fix invalid (renamed) options in ImapUI and ProxyUI that were
missed from the last checkin.

Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ImapUI.py	3 May 2003 04:07:04 -0000	1.8
--- ImapUI.py	3 May 2003 22:16:30 -0000	1.9
***************
*** 78,82 ****
      ('imap',                  'use_ssl'),
      ('Header Options',        None),
!     ('Headers',               'notate_to'),
      ('pop3proxy',             'notate_subject'),
      ('Headers',               'include_score'),
--- 78,82 ----
      ('imap',                  'use_ssl'),
      ('Header Options',        None),
!     ('pop3proxy',               'notate_to'),
      ('pop3proxy',             'notate_subject'),
      ('Headers',               'include_score'),

Index: ProxyUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ProxyUI.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ProxyUI.py	3 May 2003 04:07:04 -0000	1.5
--- ProxyUI.py	3 May 2003 22:16:30 -0000	1.6
***************
*** 85,89 ****
      ('pop3proxy',           'cache_messages'),
      ('Header Options',      None),
!     ('Headers',             'notate_to'),
      ('pop3proxy',           'notate_subject'),
      ('Headers',             'include_score'),
--- 85,89 ----
      ('pop3proxy',           'cache_messages'),
      ('Header Options',      None),
!     ('pop3proxy',           'notate_to'),
      ('pop3proxy',           'notate_subject'),
      ('Headers',             'include_score'),
***************
*** 471,476 ****
          
          # check for equal number of pop3servers and ports
!         slist = list(parms['pop3proxy_servers'])
!         plist = list(parms['pop3proxy_ports'])
          if len(slist) != len(plist):
              errmsg += '<li>The number of POP3 proxy ports specified ' + \
--- 471,476 ----
          
          # check for equal number of pop3servers and ports
!         slist = list(parms['pop3proxy_remote_servers'])
!         plist = list(parms['pop3proxy_listen_ports'])
          if len(slist) != len(plist):
              errmsg += '<li>The number of POP3 proxy ports specified ' + \
***************
*** 488,493 ****
  
          # check for equal number of smtpservers and ports
!         slist = list(parms['smtpproxy_servers'])
!         plist = list(parms['smtpproxy_ports'])
          if len(slist) != len(plist):
              errmsg += '<li>The number of SMTP proxy ports specified ' + \
--- 488,493 ----
  
          # check for equal number of smtpservers and ports
!         slist = list(parms['smtpproxy_remote_servers'])
!         plist = list(parms['smtpproxy_listen_ports'])
          if len(slist) != len(plist):
              errmsg += '<li>The number of SMTP proxy ports specified ' + \