[Spambayes-checkins] spambayes/Outlook2000/dialogs dialog_map.py, 1.29, 1.30

Mark Hammond mhammond at users.sourceforge.net
Tue Aug 26 23:30:07 EDT 2003


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

Modified Files:
	dialog_map.py 
Log Message:
Add a couple more full-stops, and remove the command prompt window when
opening the log.


Index: dialog_map.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/dialog_map.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** dialog_map.py	27 Aug 2003 00:07:07 -0000	1.29
--- dialog_map.py	27 Aug 2003 05:30:05 -0000	1.30
***************
*** 105,109 ****
              return
          if not manager.config.filter.enabled:
!             status = "Filtering is disabled.  Select 'Enable SpamBayes' to enable"
              win32gui.SendMessage(self.GetControl(), win32con.WM_SETTEXT,
                                   0, status)
--- 105,109 ----
              return
          if not manager.config.filter.enabled:
!             status = "Filtering is disabled.  Select 'Enable SpamBayes' to enable."
              win32gui.SendMessage(self.GetControl(), win32con.WM_SETTEXT,
                                   0, status)
***************
*** 122,126 ****
          watch_names = manager.FormatFolderNames(
                          config.watch_folder_ids, config.watch_include_sub)
!         filter_status = "Watching '%s'. Spam managed in '%s', %s" \
                                  % (watch_names,
                                     certain_spam_name,
--- 122,126 ----
          watch_names = manager.FormatFolderNames(
                          config.watch_folder_ids, config.watch_include_sub)
!         filter_status = "Watching '%s'. Spam managed in '%s', %s." \
                                  % (watch_names,
                                     certain_spam_name,
***************
*** 206,211 ****
      """Opens the log file for the current SpamBayes session
      """
!     import sys, os, win32api
!     if 1 or hasattr(sys, "frozen"):
          # current log always "spambayes1.log"
          log_name = os.path.join(win32api.GetTempPath(), "spambayes1.log")
--- 206,211 ----
      """Opens the log file for the current SpamBayes session
      """
!     import sys, os, win32api, win32con
!     if hasattr(sys, "frozen"):
          # current log always "spambayes1.log"
          log_name = os.path.join(win32api.GetTempPath(), "spambayes1.log")
***************
*** 214,218 ****
          else:
              cmd = 'notepad.exe "%s"' % log_name
!             os.system(cmd)
      else:
          question = "As you are running from source-code, viewing the\n" \
--- 214,218 ----
          else:
              cmd = 'notepad.exe "%s"' % log_name
!             win32api.WinExec(cmd, win32con.SW_SHOW)
      else:
          question = "As you are running from source-code, viewing the\n" \





More information about the Spambayes-checkins mailing list