author | zautrix <zautrix> | 2005-04-03 23:09:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-03 23:09:08 (UTC) |
commit | 06fbd5e92ff0cb2a5ef630f7f09ca3e1927f5cf5 (patch) (side-by-side diff) | |
tree | a9f01377dc21931e5d267edc3b196232f244d1fb /kabc/plugins/file/resourcefile.cpp | |
parent | 30359da3c126e67f6c75400323fcca4c159c3d93 (diff) | |
download | kdepimpi-06fbd5e92ff0cb2a5ef630f7f09ca3e1927f5cf5.zip kdepimpi-06fbd5e92ff0cb2a5ef630f7f09ca3e1927f5cf5.tar.gz kdepimpi-06fbd5e92ff0cb2a5ef630f7f09ca3e1927f5cf5.tar.bz2 |
sync fix
Diffstat (limited to 'kabc/plugins/file/resourcefile.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 0e6c2a3..af76558 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -75,24 +75,25 @@ __declspec(dllexport) ResourceFile::ResourceFile( const KConfig *config ) : Resource( config ) , mFormat( 0 ) { QString fileName, formatName, default_fileName; default_fileName = StdAddressBook::fileName(); KConfig *cfg = (KConfig *)config; if ( cfg ) { fileName = cfg->readEntry( "FileName", default_fileName ); formatName = cfg->readEntry( "FileFormat", "vcard" ); + mFamily = cfg->readEntry( "ResourceName", "std" ); } else { fileName = default_fileName; formatName = "vcard"; } init( fileName, formatName ); } ResourceFile::ResourceFile( const QString &fileName , const QString &formatName ) : Resource( 0 ) { @@ -112,36 +113,41 @@ void ResourceFile::init( const QString &fileName, const QString &formatName ) if ( !mFormat ) { mFormatName = "vcard"; mFormat = factory->format( mFormatName ); } #ifndef NO_DIRWATCH connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); #endif - QString localKdeDir; localKdeDir = readEnvPath("LOCALMICROKDEHOME"); if ( ! localKdeDir.isEmpty() ) { qDebug("LOCALMICROKDEHOME is set to: %s",localKdeDir.latin1() ); QFileInfo fi ( fileName ); QString localname = localKdeDir + "/apps/kabc/" + fi.fileName (); QFileInfo fi2 ( localname ); - if ( ! fi2.exists() ) { + if ( ! fi2.exists() || mFamily == "sync_res" ) { + if ( fi.exists() && mFamily == "sync_res") { + qDebug("LOCAL mode SYNC mode using absolute file path "); + setFileName( fileName ); + return; + } else { KMessageBox::error(0,i18n("Addressbook resource file not found:\n '%1'.\nIn LOCAL mode only resource files in\n'%2'\nare supported.\n(i.e. in the dir ./apps/kabc/ relative to the kapi(.exe) binary.)\n\nIf you are starting KA/Pi for the very first time\nyou will get this error message as well.\nIt will create the missing file automatically for you.").arg(localname).arg(localKdeDir+"/apps/kabc/") ); setFileName( localname ); return; + } } else { qDebug("Local resource file found. Changing filename to: %s",localname.latin1() ); setFileName( localname ); return; } } setFileName( fileName ); } ResourceFile::~ResourceFile() |