diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index 146ae6b..a429ea4 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -157,9 +157,9 @@ Application::Application(int &argc, char **argv) : QTimer::singleShot( 0, this, SLOT( slotStartFolderSetup() )); MirallConfigFile cfg; - if( !cfg.ownCloudSkipUpdateCheck() ) { + /*if( !cfg.ownCloudSkipUpdateCheck() ) { QTimer::singleShot( 3000, this, SLOT( slotStartUpdateDetector() )); - } + }*/ connect( ownCloudInfo::instance(), SIGNAL(sslFailed(QNetworkReply*, QList<QSslError>)), this,SLOT(slotSSLFailed(QNetworkReply*, QList<QSslError>))); diff --git a/src/mirall/mirallconfigfile.cpp b/src/mirall/mirallconfigfile.cpp index 47098d1..8f1cc23 100644 --- a/src/mirall/mirallconfigfile.cpp +++ b/src/mirall/mirallconfigfile.cpp @@ -401,30 +401,12 @@ void MirallConfigFile::setOwnCloudVersion( const QString& ver) bool MirallConfigFile::ownCloudSkipUpdateCheck( const QString& connection ) const { - QString con( connection ); - if( connection.isEmpty() ) con = defaultConnection(); - - QSettings settings( configFile(), QSettings::IniFormat ); - settings.setIniCodec( "UTF-8" ); - settings.beginGroup( con ); - - bool skipIt = settings.value( QLatin1String("skipUpdateCheck"), false ).toBool(); - - return skipIt; + return true; } void MirallConfigFile::setOwnCloudSkipUpdateCheck( bool skip, const QString& connection ) { - QString con( connection ); - if( connection.isEmpty() ) con = defaultConnection(); - - QSettings settings( configFile(), QSettings::IniFormat ); - settings.setIniCodec( "UTF-8" ); - settings.beginGroup( con ); - - settings.setValue( QLatin1String("skipUpdateCheck"), QVariant(skip) ); - settings.sync(); - + // We don't want the user to check updates as this is handled by rpm } int MirallConfigFile::maxLogLines() const