Skip to content

Commit

Permalink
refacotr: [compatibility] always use dde-desktop dir
Browse files Browse the repository at this point in the history
Using process names in a way that makes older versions of user data unreadable

Log: compatibility
  • Loading branch information
Johnson-zs committed Sep 24, 2024
1 parent 27afa0c commit 362d6c4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/plugins/desktop/core/ddplugin-canvas/displayconfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ QString DisplayConfig::path() const
QString configPath = paths.first();
configPath = DFMIO::DFMUtils::buildFilePath(configPath.toStdString().c_str(),
QApplication::organizationName().toStdString().c_str(),
QApplication::applicationName().toStdString().c_str(),
QString(QApplication::applicationName() + ".conf").toStdString().c_str(), nullptr);
"dde-desktop",
"dde-desktop.conf", nullptr);

return configPath;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,10 @@ OrganizerConfig::OrganizerConfig(QObject *parent)

// delay sync
d->syncTimer.setSingleShot(true);
connect(&d->syncTimer, &QTimer::timeout, this, [this]() {
d->settings->sync();
},
connect(
&d->syncTimer, &QTimer::timeout, this, [this]() {
d->settings->sync();
},
Qt::QueuedConnection);
}

Expand Down Expand Up @@ -381,7 +382,7 @@ QString OrganizerConfig::path() const
QString configPath = paths.first();
configPath = DFMIO::DFMUtils::buildFilePath(configPath.toStdString().c_str(),
QApplication::organizationName().toStdString().c_str(),
QApplication::applicationName().toStdString().c_str(),
"dde-desktop",
"ddplugin-organizer.conf", nullptr);

return configPath;
Expand Down

0 comments on commit 362d6c4

Please sign in to comment.