"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/gui/accountmanager.cpp" between
ownCloud-2.9.0.5150.tar.xz and ownCloud-2.9.1.5500.tar.xz

About: ownCloud Client (formerly "mirall") is a tool to synchronize files from ownCloud Server with your desktop client. It uses OCSync as its syncing backend.

accountmanager.cpp  (ownCloud-2.9.0.5150.tar.xz):accountmanager.cpp  (ownCloud-2.9.1.5500.tar.xz)
skipping to change at line 155 skipping to change at line 155
if (settings->childKeys().isEmpty()) { if (settings->childKeys().isEmpty()) {
// Now try to open the original ownCloud settings to see if they exist. // Now try to open the original ownCloud settings to see if they exist.
QString oCCfgFile = QDir::fromNativeSeparators(settings->fileName()); QString oCCfgFile = QDir::fromNativeSeparators(settings->fileName());
// replace the last two segments with ownCloud/owncloud.cfg // replace the last two segments with ownCloud/owncloud.cfg
oCCfgFile = oCCfgFile.left(oCCfgFile.lastIndexOf('/')); oCCfgFile = oCCfgFile.left(oCCfgFile.lastIndexOf('/'));
oCCfgFile = oCCfgFile.left(oCCfgFile.lastIndexOf('/')); oCCfgFile = oCCfgFile.left(oCCfgFile.lastIndexOf('/'));
oCCfgFile += QLatin1String("/ownCloud/owncloud.cfg"); oCCfgFile += QLatin1String("/ownCloud/owncloud.cfg");
qCInfo(lcAccountManager) << "Migrate: checking old config " << oCCfgFile ; qCInfo(lcAccountManager) << "Migrate: checking old config " << oCCfgFile ;
#ifdef Q_OS_WIN
Utility::NtfsPermissionLookupRAII ntfs_perm;
#endif
QFileInfo fi(oCCfgFile); QFileInfo fi(oCCfgFile);
if (fi.isReadable()) { if (fi.isReadable()) {
std::unique_ptr<QSettings> oCSettings(new QSettings(oCCfgFile, QSett ings::IniFormat)); std::unique_ptr<QSettings> oCSettings(new QSettings(oCCfgFile, QSett ings::IniFormat));
oCSettings->beginGroup(QLatin1String("ownCloud")); oCSettings->beginGroup(QLatin1String("ownCloud"));
// Check the theme url to see if it is the same url that the oC conf ig was for // Check the theme url to see if it is the same url that the oC conf ig was for
QString overrideUrl = Theme::instance()->overrideServerUrlV2(); QString overrideUrl = Theme::instance()->overrideServerUrlV2();
if (!overrideUrl.isEmpty()) { if (!overrideUrl.isEmpty()) {
if (overrideUrl.endsWith('/')) { if (overrideUrl.endsWith('/')) {
overrideUrl.chop(1); overrideUrl.chop(1);
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)