[Spambayes-checkins] spambayes/windows autoconfigure.py,1.11,1.12

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26016/windows

Modified Files:
	autoconfigure.py 
Log Message:
Add fixes from [ 962693 ] mozilla/thunderbird/netscape profile dir detection

(but not the mozilla part, at least yet)

Index: autoconfigure.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/windows/autoconfigure.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** autoconfigure.py	8 Jan 2004 20:35:53 -0000	1.11
--- autoconfigure.py	31 May 2004 23:11:44 -0000	1.12
***************
*** 290,294 ****
          if not m:
              break
!         current_pos = m.end()
          server_num = m.group(1)
          server = m.group(2)
--- 290,294 ----
          if not m:
              break
!         current_pos += m.end()
          server_num = m.group(1)
          server = m.group(2)
***************
*** 299,303 ****
  
          # Find the port
!         port_string = 'user_pref("mail.smtpserver.smtp1.port", '
          port_loc = prefs.find(port_string)
          if port_loc == -1:
--- 299,304 ----
  
          # Find the port
!         port_string = 'user_pref("mail.smtpserver.smtp%d.port", ' \
!                       % (server_num,)
          port_loc = prefs.find(port_string)
          if port_loc == -1:
***************
*** 339,344 ****
      filter_filename = "%s%smsgFilterRules.dat" % (config_location, os.sep)
      store_name = "" # how do we get this?
!     spam_folder_url = "mailbox:////%s//Junk%20Mail" % (store_name,)
!     unsure_folder_url = "mailbox:////%s//Possible%20Junk" % (store_name,)
      header_name = options["Headers", "classification_header_name"]
      spam_tag = options["Headers", "header_spam_string"]
--- 340,345 ----
      filter_filename = "%s%smsgFilterRules.dat" % (config_location, os.sep)
      store_name = "" # how do we get this?
!     spam_folder_url = "mailbox:////%s//Junk%%20Mail" % (store_name,)
!     unsure_folder_url = "mailbox:////%s//Possible%%20Junk" % (store_name,)
      header_name = options["Headers", "classification_header_name"]
      spam_tag = options["Headers", "header_spam_string"]
***************
*** 449,460 ****
          if proto == "POP3":
              for (server_key, port_key), sect in translate.items():
-                 server = "%s:%s" % (account[server_key][0],
-                                     account[port_key][0])
                  if sect[:4] == "pop3":
                      pop_proxy = move_to_next_free_port(pop_proxy)
                      proxy = pop_proxy
                  else:
                      smtp_proxy = move_to_next_free_port(smtp_proxy)
                      proxy = smtp_proxy
                  options[sect, "remote_servers"] += (server,)
                  options[sect, "listen_ports"] += (proxy,)
--- 450,466 ----
          if proto == "POP3":
              for (server_key, port_key), sect in translate.items():
                  if sect[:4] == "pop3":
+                     default_port = 110
                      pop_proxy = move_to_next_free_port(pop_proxy)
                      proxy = pop_proxy
                  else:
+                     default_port = 25
                      smtp_proxy = move_to_next_free_port(smtp_proxy)
                      proxy = smtp_proxy
+                 if account.has_key(port_key):
+                     port = account[port_key][0]
+                 else:
+                     port = default_port
+                 server = "%s:%s" % (account[server_key][0], port)
                  options[sect, "remote_servers"] += (server,)
                  options[sect, "listen_ports"] += (proxy,)