summaryrefslogtreecommitdiffstats
path: root/twin
diff options
context:
space:
mode:
authorMavridis Philippe <mavridisf@gmail.com>2023-06-22 15:01:37 +0300
committerMavridis Philippe <mavridisf@gmail.com>2023-07-07 12:03:13 +0300
commit84ab47055dcfb9cf1bb11a22c8ab6de3fb0819b7 (patch)
tree6b08b8c74ca18d8e9b047ef320a3a8167306158d /twin
parent7a45949a764947a641f4dcdcfc9d9608bdbdab18 (diff)
downloadtdebase-84ab47055dcfb9cf1bb11a22c8ab6de3fb0819b7.tar.gz
tdebase-84ab47055dcfb9cf1bb11a22c8ab6de3fb0819b7.zip
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 <mavridisf@gmail.com>
Diffstat (limited to 'twin')
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp6
-rw-r--r--twin/lib/kdecoration_plugins_p.cpp3
2 files changed, 3 insertions, 6 deletions
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";
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index 0e2bc0d04..5f6cdd8f5 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -98,9 +98,6 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
TDEConfigGroupSaver saver( config, "Style" );
nameStr = config->readEntry("PluginLib", defaultPlugin );
}
- // make sure people can switch between HEAD and twin_iii branch
- if( nameStr.startsWith( "twin_" ))
- nameStr = "twin3_" + nameStr.mid( 5 );
KLibrary *oldLibrary = library;
KDecorationFactory* oldFactory = fact;