Commit ff84a4e5 authored by Fabian Vogt's avatar Fabian Vogt

[gmenu-dbusmenu-proxy] Don't create ~/.gtkrc-2.0

Summary: BUG: 412970

Test Plan: GTK-2.0 applications use breeze again. Global menu activation still works.

Reviewers: broulik

Reviewed By: broulik

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D24664
parent 013e7ae0
......@@ -98,7 +98,7 @@ MenuProxy::MenuProxy()
enableGtkSettings(false);
}
// kde-gtk-config just deletes and re-creates the gtkrc-2.0, watch this and add out config to it again
// kde-gtk-config just deletes and re-creates the gtkrc-2.0, watch this and add our config to it again
m_writeGtk2SettingsTimer->setSingleShot(true);
m_writeGtk2SettingsTimer->setInterval(1000);
connect(m_writeGtk2SettingsTimer, &QTimer::timeout, this, &MenuProxy::writeGtk2Settings);
......@@ -178,9 +178,15 @@ QString MenuProxy::gtk3SettingsIniPath()
void MenuProxy::writeGtk2Settings()
{
QFile rcFile(gtkRc2Path());
if (!rcFile.exists()) {
// Don't create it here, that would break writing default GTK-2.0 settings on first login,
// as the gtkbreeze kconf_update script only does so if it does not exist
return;
}
qCDebug(DBUSMENUPROXY) << "Writing gtkrc-2.0 to" << (m_enabled ? "enable" : "disable") << "global menu support";
QFile rcFile(gtkRc2Path());
if (!rcFile.open(QIODevice::ReadWrite | QIODevice::Text)) {
return;
}
......
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