author | zautrix <zautrix> | 2005-03-30 13:24:56 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-30 13:24:56 (UTC) |
commit | 056f171723a9301aea5a65340dffeda34e078abf (patch) (unidiff) | |
tree | 7930525c801dd9c5d9a910b71bca7dc79e10f666 /kabc | |
parent | b5222dd7a607f78235b1ea39fea0f95a9c08ccd3 (diff) | |
download | kdepimpi-056f171723a9301aea5a65340dffeda34e078abf.zip kdepimpi-056f171723a9301aea5a65340dffeda34e078abf.tar.gz kdepimpi-056f171723a9301aea5a65340dffeda34e078abf.tar.bz2 |
fixes
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 4ab7f02..0e6c2a3 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp | |||
@@ -126,15 +126,21 @@ void ResourceFile::init( const QString &fileName, const QString &formatName ) | |||
126 | localKdeDir = readEnvPath("LOCALMICROKDEHOME"); | 126 | localKdeDir = readEnvPath("LOCALMICROKDEHOME"); |
127 | if ( ! localKdeDir.isEmpty() ) { | 127 | if ( ! localKdeDir.isEmpty() ) { |
128 | qDebug("LOCALMICROKDEHOME is set to: %s",localKdeDir.latin1() ); | 128 | qDebug("LOCALMICROKDEHOME is set to: %s",localKdeDir.latin1() ); |
129 | QFileInfo fi ( fileName ); | ||
130 | QString localname = localKdeDir + "/apps/kabc/" + fi.fileName (); | ||
131 | QFileInfo fi2 ( localname ); | ||
132 | if ( ! fi2.exists() ) { | ||
133 | 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/") ); | ||
134 | setFileName( localname ); | ||
135 | return; | ||
129 | 136 | ||
130 | 137 | } else { | |
131 | 138 | qDebug("Local resource file found. Changing filename to: %s",localname.latin1() ); | |
132 | 139 | setFileName( localname ); | |
140 | return; | ||
133 | } | 141 | } |
134 | qDebug("RESOURCE: %s ", fileName.latin1()); | ||
135 | |||
136 | |||
137 | 142 | ||
143 | } | ||
138 | setFileName( fileName ); | 144 | setFileName( fileName ); |
139 | } | 145 | } |
140 | 146 | ||