[Spambayes-checkins] spambayes/Outlook2000 config_wizard.py, 1.6, 1.7

[Mark Hammond]

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

Modified Files:
	config_wizard.py 
Log Message:
If the user said in the Wizard they wanted to configure manually, we
screwed up 2 things:
* We created the folders and configured spambayes anyway!
* But we didn't save anything, even what the user did from that dialog.


Index: config_wizard.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/config_wizard.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config_wizard.py	26 Aug 2003 08:12:20 -0000	1.6
--- config_wizard.py	29 Aug 2003 00:08:43 -0000	1.7
***************
*** 81,84 ****
--- 81,91 ----
      
  def CommitWizardConfig(manager, wc):
+     # If the user want to manually configure, then don't do anything
+     if wc.wizard.preparation == 2: # manually configure
+         import dialogs
+         dialogs.ShowDialog(0, manager, manager.config, "IDD_MANAGER")
+         manager.SaveConfig()
+         return
+ 
      # Create the ham and spam folders, if necessary.
      manager.config.filter.watch_folder_ids = wc.filter.watch_folder_ids
***************
*** 104,111 ****
      if wiz_cd:
          manager.classifier_data.Adopt(wiz_cd)
!     if wc.wizard.preparation == 2: # manually configure
!         import dialogs
!         dialogs.ShowDialog(0, manager, manager.config, "IDD_MANAGER")
!     elif wc.wizard.will_train_later:
          # User cancelled, but said they will sort their mail for us.
          # don't save the config - this will force the wizard up next time
--- 111,115 ----
      if wiz_cd:
          manager.classifier_data.Adopt(wiz_cd)
!     if wc.wizard.will_train_later:
          # User cancelled, but said they will sort their mail for us.
          # don't save the config - this will force the wizard up next time