diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 9446fc8951..8b88ced64a 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -28,7 +28,7 @@ install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_u ########### install files ############### -install( FILES fsp_workarounds_1 DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules ) +install( FILES fsp_workarounds_1.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules ) install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} ) install( FILES kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install(PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) diff --git a/data/fsp_workarounds_1 b/data/fsp_workarounds_1.kwinrules similarity index 61% rename from data/fsp_workarounds_1 rename to data/fsp_workarounds_1.kwinrules index 37948fea52..771ef8bf20 100644 --- a/data/fsp_workarounds_1 +++ b/data/fsp_workarounds_1.kwinrules @@ -1,5 +1,5 @@ [1] -description=(Default) Disable focus stealing prevention for XV +Description=(Default) Disable focus stealing prevention for XV fsplevel=0 fsplevelrule=2 wmclass=^xv .* diff --git a/data/kwin_fsp_workarounds_1.upd b/data/kwin_fsp_workarounds_1.upd index 18e7460ff4..2d725d2d24 100644 --- a/data/kwin_fsp_workarounds_1.upd +++ b/data/kwin_fsp_workarounds_1.upd @@ -4,5 +4,5 @@ Id=kde351 File=kwinrules_update Group=Dummy Options=overwrite -ScriptArguments=fsp_workarounds_1 +ScriptArguments=fsp_workarounds_1.kwinrules Script=kwin_update_default_rules diff --git a/rules.cpp b/rules.cpp index 60fe9c7933..dad0d30790 100644 --- a/rules.cpp +++ b/rules.cpp @@ -113,7 +113,9 @@ static int limit0to4( int i ) { return qMax( 0, qMin( 4, i )); } void Rules::readFromCfg( const KConfigGroup& cfg ) { - description = cfg.readEntry( "description" ); + description = cfg.readEntry( "Description" ); + if( description.isEmpty()) // capitalized first, lowercase for backwards compatibility + description = cfg.readEntry( "description" ); READ_MATCH_STRING( wmclass, .toLower().toLatin1() ); wmclasscomplete = cfg.readEntry( "wmclasscomplete" , false); READ_MATCH_STRING( windowrole, .toLower().toLatin1() ); @@ -204,7 +206,7 @@ void Rules::readFromCfg( const KConfigGroup& cfg ) void Rules::write( KConfigGroup& cfg ) const { - cfg.writeEntry( "description", description ); + cfg.writeEntry( "Description", description ); // always write wmclass WRITE_MATCH_STRING( wmclass, (const char*), true ); cfg.writeEntry( "wmclasscomplete", wmclasscomplete );