Commit 25286adf authored by Thomas McGuire's avatar Thomas McGuire
Browse files

Remove the automatic resource name setting.

I don't think it is very user friendly to have a filename as the name of the root
collection.

Also, this overwrites the settings from firstrun.cpp. Now one sees "Personal Calendar"
instead of "std.ics" for the default installation.

Volker, please review and tell me if I broke something with this.

svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1030651
parent dea71b9e
......@@ -68,8 +68,6 @@ class SingleFileResource : public SingleFileResourceBase
if ( KDirWatch::self()->contains( mCurrentUrl.toLocalFile() ) )
KDirWatch::self()->removeFile( mCurrentUrl.toLocalFile() );
const bool nameWasChanged = mCurrentUrl.fileName() != name() && !mCurrentUrl.isEmpty();
if ( Settings::self()->path().isEmpty() ) {
emit status( Broken, i18n( "No file selected." ) );
return;
......@@ -85,9 +83,6 @@ class SingleFileResource : public SingleFileResourceBase
if ( mCurrentUrl.isLocalFile() )
{
if ( !nameWasChanged )
setName( mCurrentUrl.fileName() );
// check if the file does not exist yet, if so, create it
if ( !QFile::exists( mCurrentUrl.toLocalFile() ) ) {
QFile f( mCurrentUrl.toLocalFile() );
......
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