diff options
| author | albator <[email protected]> | 2011-10-21 20:16:07 +0200 |
|---|---|---|
| committer | albator <[email protected]> | 2011-10-21 20:16:07 +0200 |
| commit | 7a0adf35896618a7570e425941fc1b74c54def47 (patch) | |
| tree | 16dab9d8bfbd93575440f357c70907cbb5480980 /mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch | |
| parent | cd71be65dc30c8007ec54becdf6c50260ed8e908 (diff) | |
| parent | a8707e2a9f22d082cecb8ea6079175076f983c55 (diff) | |
| download | tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.tar.gz tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch')
| -rw-r--r-- | mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch b/mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch new file mode 100644 index 000000000..08deeb032 --- /dev/null +++ b/mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch @@ -0,0 +1,28 @@ +--- kdebase-3.3.2/kdm/kfrontend/themer/kdmthemer.cpp-- 2005-02-28 15:16:19.881739297 +0100 ++++ kdebase-3.3.2/kdm/kfrontend/themer/kdmthemer.cpp 2005-02-28 15:17:37.816468727 +0100 +@@ -57,11 +57,23 @@ KdmThemer::KdmThemer( const QString &_fi + + // read the XML file and create DOM tree + TQString filename = _filename; +- if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) { ++ if ( _filename.startsWith("/usr/share/mdk/dm") ) ++ { ++ if (!::access( TQFile::encodeName( filename + "/KdmGreeterTheme.desktop" ), R_OK )) { ++ KSimpleConfig cfg( filename + "/KdmGreeterTheme.desktop" ); ++ cfg.setGroup( "GdmGreeterTheme" ); ++ filename += '/' + cfg.readEntry( "Greeter" ); ++ } ++ } ++ else ++ { ++ if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) { + KSimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" ); + cfg.setGroup( "GdmGreeterTheme" ); + filename += '/' + cfg.readEntry( "Greeter" ); +- } ++ } ++ } ++ + TQFile opmlFile( filename ); + if (!opmlFile.open( IO_ReadOnly )) { + FDialog::box( widget(), errorbox, i18n( "Cannot open theme file %1" ).arg(filename) ); |