Commits

GreydMiyu committed a1f7f57 Merge

Resolved conflict, merge.

  • Participants
  • Parent commits 8ad39f2, 2abaee6

Comments (0)

Files changed (1)

             err('Directory %s does not exist' % (dir))
 
 
-def refresh_fileList():
-    '''Reload the file list'''
-    init_filelist()
-
-
 def displayheaders():
     '''Load message, display selected headers and first bit of the body.'''
     try:
     print('----------\n')
 
 
-#def RazorSpam(id):
-#    '''Report as Spam to Vipul's Razor'''
-#    filepath = FileList.GetPyData(id)
-#    if os.path.isfile(filepath):
-#        MainStatus.SetStatusText('Reporting message as spam.',0)
-#        Refresh()
-#        Update()
-#        wxYield()
-#        code = os.system("%s '%s'" % (vars.razor_spam, filepath))
-#        if code:
-#            raise(EnvironmentError, "Error trying to process %s '%s'"
-#                                    % (vars.razor_spam, filepath))
-
-
-#def RazorHam(id):
-#    '''Report as ham to Vipul's Razor'''
-#    filepath = FileList.GetPyData(id)
-#    if os.path.isfile(filepath):
-#        MainStatus.SetStatusText('Reporting message as ham.',0)
-#        Refresh()
-#        Update()
-#        wxYield()
-#        code = os.system("%s '%s'" % (vars.razor_ham,filepath))
-#        if code:
-#            raise(EnvironmentError, "Error trying to process %s '%s'"
-#                                    % (vars.razor_ham, filepath))
-
-
 def saforget(filepath):
     '''Send to SA to forget'''
     if os.path.isfile(filepath):
                                       filepath))
         if code:
             raise(EnvironmentError, "Error trying to process %s '%s'"
-                                    % (vars.sa_spam, filepath))
+                                    % (config.get('ExtCmd', 'sa_forget'),
+                                       filepath))
 
 
 def saspam(filepath):
                                       filepath))
         if code:
             raise(EnvironmentError, "Error trying to process %s '%s'"
-                                    % (vars.sa_spam, filepath))
+                                    % (config.get('ExtCmd', 'sa_spam'),
+                                       filepath))
 
 
 def saham(filepath):
                                       filepath))
         if code:
             raise(EnvironmentError, "Error trying to process %s '%s'"
-                                    % (vars.sa_ham, filepath))
+                                    % (config.get('ExtCmd', 'sa_ham'),
+                                       filepath))
 
 
 def delmsg(filepath=None):