5c5
< #    version              : $Revision: 1.9 $
---
> #    version              : $Revision: 1.9.2.1 $
76c76
< 			faxIncoming(call,call_from,call_to,curr_user,config)
---
> 			faxIncoming(call,call_from,call_to,curr_user,config,0)
88c88,89
< def faxIncoming(call,call_from,call_to,curr_user,config):
---
> # @param already_connected 1 if we're already connected (that means we must switch to fax mode)
> def faxIncoming(call,call_from,call_to,curr_user,config,already_connected):
116c117,120
< 		faxInfo=capisuite.connect_faxG3(call,stationID,headline,0)
---
> 		if (already_connected):
> 			faxInfo=capisuite.switch_to_faxG3(call,stationID,headline)
> 		else:
> 			faxInfo=capisuite.connect_faxG3(call,stationID,headline,0)
206,212c210
< 			stationID=cs_helpers.getOption(config,curr_user,"fax_stationID")
< 			if (stationID==None):
< 				capisuite.error("Warning: fax_stationID not found for user "+curr_user+" -> using empty string")
< 				stationID=""
< 			headline=cs_helpers.getOption(config,curr_user,"fax_headline","") # empty string is no problem here
< 			capisuite.switch_to_faxG3(call,stationID,headline)
< 			faxIncoming(call,call_from,call_to,curr_user,config)
---
> 			faxIncoming(call,call_from,call_to,curr_user,config,1)
409a408,412
> # Revision 1.9.2.1  2003/08/24 12:47:19  gernot
> # - faxIncoming tried to reconnect when it was called after a switch from
> #   voice to fax mode, which lead to a call abort. Thx to Harald Jansen &
> #   Andreas Scholz for reporting!
> #