Revert "Make the kde-gtk-config kcm better at checking global gtk settings"
ClosedPublic
Actions

Authored by fvogt on Oct 24 2017, 11:30 AM.

Details

Reviewers

apol
davidedmundson

Group Reviewers

Plasma

Commits

R99:0d0f812a1704: Revert "Make the kde-gtk-config kcm better at checking global gtk settings"

Summary

This reverts commit 34357f74ee2d98128ff423b0ec6ddcbf4232c475.

Reverting this fixes loading of the actually used GTK settings.

BUG: 382291

Test Plan

Opened kcmshell5 kde-gtk-config with and without this revert.
Without, it shows Adwaita as theme, with it shows breeze.
GTK uses breeze, so the behaviour with the revert is correct.

Diff Detail

Repository

R99 KDE Gtk Configuration Tool

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

fvogt created this revision.Oct 24 2017, 11:30 AM

Restricted Application added a project: Plasma. · View Herald TranscriptOct 24 2017, 11:30 AM

I made the same revert to test earlier this morning, and on brief testing it seems to have solved the issue, and tests still pass.

Heh, so much for unit tests.

Hopefully we can revisit this for master and try and fix whatever the original one was doing.

This revision is now accepted and ready to land.Oct 24 2017, 11:51 AM

ngraham added a subscriber: ngraham.Oct 24 2017, 12:55 PM

Closed by commit R99:0d0f812a1704: Revert "Make the kde-gtk-config kcm better at checking global gtk settings" (authored by fvogt). · Explain WhyOct 24 2017, 12:57 PM

This revision was automatically updated to reflect the committed changes.

Well this breaks supporting having configuration over in /etc, so indeed this wasn't tested.

It's unfortunate that the only solution we always end up in is reverting stuff rather than actual investigation. Oh well, I'll spend some time on this at some point.

Revision Contents
Changeset List

			Path	Packages
M			CMakeLists.txt (2 lines)
M			src/abstractappearance.h (5 lines)
M			src/appearancegtk2.h (11 lines)
M			src/appearancegtk2.cpp (103 lines)
M			src/appearancegtk3.h (10 lines)
M			src/appearancegtk3.cpp (143 lines)
M			src/appearencegtk.cpp (4 lines)
M			tests/CMakeLists.txt (2 lines)
M			tests/configsavetest.h (8 lines)
M			tests/configsavetest.cpp (75 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	21230	c8cc22e		Oct 24 2017, 11:30 AM	★	★
Diff 2	21234	c8cc22e	R99:0d0f812a1704c62c014bc87162b1280224b64f93	Oct 24 2017, 12:54 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
8cf70668005c	d8ae21adeadc	c8cc22ee3d23	Fabian Vogt	Revert "Make the kde-gtk-config kcm better at checking global gtk settings" (Show More…)	Oct 24 2017, 11:25 AM