[KBear-cvs] kbear/kbear/lib/jobclasses kbearsynchjob.cpp,1.3,1.4

[<fri...@us...>]

Update of /cvsroot/kbear/kbear/kbear/lib/jobclasses
In directory sc8-pr-cvs1:/tmp/cvs-serv20556/kbear/lib/jobclasses

Modified Files:
	kbearsynchjob.cpp 
Log Message:
Changes to the synchjob and a dirsynch Makefile fix.

Index: kbearsynchjob.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/jobclasses/kbearsynchjob.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kbearsynchjob.cpp	16 Jul 2003 00:03:06 -0000	1.3
--- kbearsynchjob.cpp	28 Aug 2003 20:53:00 -0000	1.4
***************
*** 19,22 ****
--- 19,23 ----
  #include "connectionmanager.h"
  #include "kbearcopyjob.h"
+ #include "kbearfilecopyjob.h"
  #include "kbeardeletejob.h"
  #include "kbearlistjob.h"
***************
*** 31,35 ****
  
  {
! 	makeSourceList( m_srcList );
  }
  
--- 32,36 ----
  
  {
! // 	makeSourceList( m_srcList );
  }
  
***************
*** 39,47 ****
  
  {
! 	makeSourceList( m_srcList );
  }
  
  void KBearSynchJob::slotStart()
  {
  	KBearCopyJob *job = new KBearCopyJob( m_srcList, m_dest, KBearCopyJob::Copy, false );
  	job->setOverwriteAll();
--- 40,59 ----
  
  {
! // 	makeSourceList( m_srcList );
  }
  
  void KBearSynchJob::slotStart()
  {
+     if( m_srcList.isEmpty() || m_dest.isMalformed() ) {
+ 	    kdDebug()<<"Error: KBearSynchJob::slotStart(): Source list is empty or destination url is malformed"<<endl;
+ 	    return;
+ 	}
+     kdDebug()<<"KBearSynchJob::slotStart(): "<<m_srcList.first().prettyURL()<<endl;
+     KURL::List::Iterator it = m_srcList.begin();
+ 	for( ; it != m_srcList.end(); it++ ) {
+         KIO::Job *job = KBearFileCopyJob::file_copy( m_sourceID, m_destID, *it, m_dest );
+ 		job->setAutoErrorHandlingEnabled( true, 0 );
+ 	}
+ /*	kdDebug()<<"KBearSynchJob::slotStart() 111:"<<m_srcList.first().prettyURL()<<endl;
  	KBearCopyJob *job = new KBearCopyJob( m_srcList, m_dest, KBearCopyJob::Copy, false );
  	job->setOverwriteAll();
***************
*** 57,60 ****
--- 69,73 ----
  		this, SIGNAL( processedFiles( KIO::Job*, unsigned long ) ) );
  	job->slotStart( m_sourceID, m_destID );
+ 	kdDebug()<<"KBearSynchJob::slotStart() 222:"<<m_srcList.first().prettyURL()<<endl;*/
  }
  
***************
*** 70,73 ****
--- 83,88 ----
  
  void KBearSynchJob::makeSourceList( KURL::List& srcList ) {
+     if( m_srcList.isEmpty() || m_dest.isMalformed() )
+ 	    return;
  	KURL::List::Iterator it = srcList.begin();
  	for( ; it != srcList.end(); it++ ) {
***************
*** 79,82 ****
--- 94,98 ----
  		connect( job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotStart() ) );
  	}
+ 	kdDebug()<<"KBearSynchJob::makeSourceList: "<<srcList.first().url()<<endl;
  }