Commit f7269279 authored by Pino Toscano's avatar Pino Toscano

look for the old kpdf stuff only if the "new okular" stuff is not found

svn path=/trunk/KDE/kdegraphics/okular/; revision=710703
parent 18afc2df
......@@ -1171,13 +1171,16 @@ bool Document::openDocument( const QString & docFile, const KUrl& url, const KMi
fileReadTest.close();
QString newokular = "okular/docdata/" + fn;
QString newokularfile = KStandardDirs::locateLocal( "data", newokular );
QString oldkpdf = "kpdf/" + fn;
QString oldkpdffile = KStandardDirs::locateLocal( "data", oldkpdf );
if ( QFile::exists( oldkpdffile ) && !QFile::exists( newokularfile ) )
if ( !QFile::exists( newokularfile ) )
{
// ### copy or move?
if ( !QFile::copy( oldkpdffile, newokularfile ) )
return false;
QString oldkpdf = "kpdf/" + fn;
QString oldkpdffile = KStandardDirs::locateLocal( "data", oldkpdf );
if ( QFile::exists( oldkpdffile ) )
{
// ### copy or move?
if ( !QFile::copy( oldkpdffile, newokularfile ) )
return false;
}
}
d->m_xmlFileName = newokularfile;
}
......
......@@ -121,10 +121,11 @@ m_cliPresentation(false), m_generatorGuiClient(0)
{
// first necessary step: copy the configuration from kpdf, if available
QString newokularconffile = KStandardDirs::locateLocal( "config", "okularpartrc" );
QString oldkpdfconffile = KStandardDirs::locateLocal( "config", "kpdfpartrc" );
if ( !QFile::exists( newokularconffile ) && QFile::exists( oldkpdfconffile ) )
if ( !QFile::exists( newokularconffile ) )
{
QFile::copy( oldkpdfconffile, newokularconffile );
QString oldkpdfconffile = KStandardDirs::locateLocal( "config", "kpdfpartrc" );
if ( QFile::exists( oldkpdfconffile ) )
QFile::copy( oldkpdfconffile, newokularconffile );
}
QDBusConnection::sessionBus().registerObject("/okular", this, QDBusConnection::ExportScriptableSlots);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment