2 files changed, 4 insertions, 2 deletions

diff --git a/kde2file/abdump/main.cpp b/kde2file/abdump/main.cpp
index b359cfe..824d054 100644
--- a/kde2file/abdump/main.cpp
+++ b/kde2file/abdump/main.cpp
@@ -57,97 +57,98 @@ static KCmdLineOptions options[] =
         { "dump",
           I18N_NOOP( "Dumps addressbook" ), 0 },
         { "read",
           I18N_NOOP( "Reads addressbook" ), 0 },
         KCmdLineLastOption
     };
 
 int main( int argc, char *argv[] )
 {
     KAboutData aboutData(
                          progName,                        // internal program name
                          I18N_NOOP( progDisplay ),        // displayable program name.
                          progVersion,                     // version string
                          I18N_NOOP( progDesc ),           // short porgram description
                          KAboutData::License_GPL,         // license type
                          "(c) 2004, Lutz Rogowski", // copyright statement
                          0,                               // any free form text
                          "",                         // program home page address
                          "bugs.kde.org"                   // bug report email address
                          );
 
 
     // KCmdLineArgs::init() final 'true' argument indicates no commandline options
     // for QApplication/KApplication (no KDE or Qt options)
     KCmdLineArgs::init( argc, argv, &aboutData, true );
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
     KInstance ins  ( progName );
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
     bool read = false;
     if ( args->isSet( "read" ) ) {
         read = true;
         qDebug("read ");
     }
     QString fileName = QDir::homeDirPath ()+"/.kdeaddressbookdump.vcf";
 
     KABC::StdAddressBook* standardAddressBook = KABC::StdAddressBook::self();
     standardAddressBook->setAutomaticSave( false );
     qDebug("************************************* ");
     qDebug("***************kdeABdump************* ");
     qDebug("************************************* ");
     if ( !read ) {
         KABC::AddressBook::Iterator it;
         KABC::VCardConverter converter;
         QString datastream;
         for( it = standardAddressBook->begin(); it != standardAddressBook->end(); ++it ) { 
-            if ( (*it).isEmpty() || ! (*it).resource() )
+            // if ( (*it).isEmpty() || ! (*it).resource() )
+             if ( (*it).isEmpty()  )
                 continue;
             KABC::Addressee a = ( *it );
             QString vcard = converter.createVCard( a );
             vcard += QString("\r\n");
             datastream += vcard;
         }
          QFile outFile(fileName);
          if ( outFile.open(IO_WriteOnly) ) { 
              QTextStream t( &outFile );  // use a text stream
              t.setEncoding( QTextStream::UnicodeUTF8 );
              t <<datastream;
              t <<  "\r\n\r\n";
              outFile.close();
          }
     } else {
         //Addressee::List aList;//parseVCards( const QString& vcard );
         KABC::Addressee::List list;
         int added = 0, changedC = 0, deleted = 0;
         QFile file( fileName );
         if ( file.open( IO_ReadOnly ) ) {
             QTextStream t( &file );  // use a text stream
             t.setEncoding( QTextStream::UnicodeUTF8 );
             QString data;
             data = t.read();
             file.close();
             KABC::VCardConverter converter;
             list = converter.parseVCards( data );
             qDebug("kdeABdump::file has %d entries", list.count());
 
             KABC::Addressee::List::Iterator it;
             for ( it = list.begin();it != list.end();++it) {
                 (*it).setChanged( true ); 
                 bool changed = ((*it).custom( "KADDRESSBOOK", "X-ExternalID" ) == "changed");
                 (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
                 //qDebug("ext %s ", (*it).custom( "KADDRESSBOOK", "X-ExternalID" ).latin1());
                 if ( changed ) {
                     //qDebug("changed Addressee found! ");
                     KABC::Addressee std = standardAddressBook->findByUid( (*it).uid() );
                     if ( ! std.isEmpty() )
                         (*it).setResource(std.resource());
                     standardAddressBook->insertAddressee( (*it) );
                     ++changedC;
                 } else {
                     //maybe added?
                     KABC::Addressee std = standardAddressBook->findByUid( (*it).uid() );
                     if (  std.isEmpty() ) {
                         standardAddressBook->insertAddressee( (*it) );
                         ++added;
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 9cc1a73..c8755cd 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -84,97 +84,98 @@ int main( int argc, char *argv[] )
                          progName,                        // internal program name
                          I18N_NOOP( progDisplay ),        // displayable program name.
                          progVersion,                     // version string
                          I18N_NOOP( progDesc ),           // short porgram description
                          KAboutData::License_GPL,         // license type
                          "(c) 2004, Lutz Rogowski", // copyright statement
                          0,                               // any free form text
                          "",                         // program home page address
                          "bugs.kde.org"                   // bug report email address
                          );
 
 
     // KCmdLineArgs::init() final 'true' argument indicates no commandline options
     // for QApplication/KApplication (no KDE or Qt options)
     KCmdLineArgs::init( argc, argv, &aboutData, true );
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
     KInstance ins  ( progName );
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
     bool read = false;
     if ( args->isSet( "read" ) ) {
         read = true;
         qDebug("read ");
     }
     QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
     CalendarResources *calendarResource = 0;
     CalendarLocal *localCalendar = 0;
     KConfig c( locate( "config", "korganizerrc" ) );
     c.setGroup( "Time & Date" );
     QString tz = c.readEntry( "TimeZoneId" );
     calendarResource = new CalendarResources( tz );
     calendarResource->readConfig();
     calendarResource->load();
     qDebug("************************************* ");
     qDebug("**************kdecaldump************* ");
     qDebug("************************************* ");
     qDebug("Using timezone ID: %s", calendarResource->timeZoneId().latin1());
 
     if ( !read ) {
         localCalendar = new CalendarLocal();
         localCalendar->setTimeZoneId( calendarResource->timeZoneId());
         KCal::Incidence::List  allInc = calendarResource->rawIncidences();
         Incidence::List::ConstIterator it;
         int num = 0;
         for( it = allInc.begin(); it != allInc.end(); ++it ) {
             ResourceCalendar * re = calendarResource->resource( (*it) );
-            if ( re ) {
+            //if ( re ) 
+                {
                 ++num;
                 Incidence* cl = (*it)->clone();
                 cl->setLastModified( (*it)->lastModified() );
                 if ( cl->type() == "Journal" )
                     localCalendar->addJournal( (Journal *) cl  );
                 else if ( cl->type() == "Todo" )
                     localCalendar->addTodo( (Todo *) cl );
                 else if ( cl->type() == "Event" )
                     localCalendar->addEvent( (Event *) cl );
             }
         }
   
         FileStorage* storage = new FileStorage( calendarResource );
         storage->setFileName( fileName );
         storage->setSaveFormat( new ICalFormat() );
         storage->save();
         delete storage;
         qDebug("************************************* ");
         qDebug("************kdecaldump*************** ");
         qDebug("************************************* ");
         qDebug("%d calendar entries dumped to file %s", num, fileName.latin1());
 
     } else {
         qDebug("************load");
         localCalendar = new CalendarLocal();
         localCalendar->setTimeZoneId( calendarResource->timeZoneId());
         FileStorage* storage = new FileStorage( localCalendar );
         storage->setFileName( fileName );
         int num = 0;
         int del = 0;
         int add = 0;
         if ( storage->load() ) {
             qDebug("***********loaded!");
             KCal::Incidence::List  newInc = localCalendar->rawIncidences();
             Incidence::List::ConstIterator it;
             for( it = newInc.begin(); it != newInc.end(); ++it ) {
                 if ( (*it)->pilotId() > 1 ) { //changed
                     qDebug("*********pilot id %d %s ",(*it)->pilotId() ,(*it)->summary().latin1());
                     Incidence *incOld = calendarResource->incidence( (*it)->uid() );
                     ResourceCalendar * res = 0;
                     if ( incOld )
                         res = calendarResource->resource( incOld );
                     if ( res ) {
                         Incidence* cl = (*it)->clone();
                         cl->setPilotId( incOld->pilotId() );
                         ++num;
                         if ( incOld->type() == "Journal" )
                             calendarResource->deleteJournal( (Journal *) incOld  );