From 84ab47055dcfb9cf1bb11a22c8ab6de3fb0819b7 Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Thu, 22 Jun 2023 15:01:37 +0300 Subject: Make TWin look for `twin_` libraries This is now the preferred way of calling the decoration libraries (in place of `twin3_`). The old names that start with `twin3_` are still recognized for compatibility reasons. This resolves issue #351. Signed-off-by: Mavridis Philippe --- twin/kcmtwin/twindecoration/twindecoration.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'twin/kcmtwin') diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 79a72aafd..0564d380e 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -414,7 +414,7 @@ void KWinDecorationModule::findDecorations() KDesktopFile desktopFile(filename); TQString libName = desktopFile.readEntry("X-TDE-Library"); - if (!libName.isEmpty() && libName.startsWith( "twin3_" )) + if (!libName.isEmpty() && libName.startsWith("twin_") || libName.startsWith("twin3_")) { DecorationInfo di; di.name = desktopFile.readName(); @@ -614,7 +614,7 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name ) void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& currentDecoName ) { // Config names are "twin_icewm_config" - // for "twin3_icewm" twin client + // for "twin_icewm" twin client TQString oldName = styleToConfigLib( oldLibraryName ); @@ -938,7 +938,7 @@ void KWinDecorationModule::checkSupportedBorderSizes() TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib ) { - if( styleLib.startsWith( "twin3_" )) + if( styleLib.startsWith( "twin_" )) return "twin_" + styleLib.mid( 6 ) + "_config"; else return styleLib + "_config"; -- cgit v1.2.1