| author | harlekin <harlekin> | 2002-09-21 18:13:18 (UTC) |
|---|---|---|
| committer | harlekin <harlekin> | 2002-09-21 18:13:18 (UTC) |
| commit | 3838d736783c5d33197cb8d99f611ab214460bd9 (patch) (side-by-side diff) | |
| tree | 654ac2c3344791245d3efd0eacfaf71f680d4bd7 /core | |
| parent | c0c3232de8f21a7a0ad0918b9e6fb7bd33d01468 (diff) | |
| download | opie-3838d736783c5d33197cb8d99f611ab214460bd9.zip opie-3838d736783c5d33197cb8d99f611ab214460bd9.tar.gz opie-3838d736783c5d33197cb8d99f611ab214460bd9.tar.bz2 | |
usual
| -rw-r--r-- | core/settings/launcher/.cvsignore | 2 | ||||
| -rw-r--r-- | core/settings/launcher/taskbarsettings.cpp | 23 |
2 files changed, 14 insertions, 11 deletions
diff --git a/core/settings/launcher/.cvsignore b/core/settings/launcher/.cvsignore new file mode 100644 index 0000000..034a627 --- a/dev/null +++ b/core/settings/launcher/.cvsignore @@ -0,0 +1,2 @@ +Makefile* +moc_*
\ No newline at end of file diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp index 8f16951..7df9a68 100644 --- a/core/settings/launcher/taskbarsettings.cpp +++ b/core/settings/launcher/taskbarsettings.cpp @@ -88,17 +88,18 @@ void TaskbarSettings::init ( ) QLibrary *lib = new QLibrary ( path + "/" + *it ); lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); - if ( iface ) { - QString lang = getenv( "LANG" ); - QTranslator *trans = new QTranslator ( qApp ); - QString type = (*it). left ((*it). find (".")); - QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; - if ( trans-> load ( tfn )) - qApp-> installTranslator ( trans ); + if ( iface ) { + + QString lang = getenv( "LANG" ); + QTranslator *trans = new QTranslator ( qApp ); + QString type = (*it). left ((*it). find (".")); + QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; + if ( trans-> load ( tfn )) + qApp-> installTranslator ( trans ); else - delete trans; - name = iface-> name ( ); - icon = iface-> icon ( ); + delete trans; + name = iface-> name ( ); + icon = iface-> icon ( ); iface-> release ( ); lib-> unload ( ); } else { @@ -106,7 +107,7 @@ void TaskbarSettings::init ( ) name = (*it). mid ( 3 ); int sep = name. find( ".so" ); if ( sep > 0 ) - name. truncate ( sep ); + name. truncate ( sep ); sep = name. find ( "applet" ); if ( sep == (int) name.length ( ) - 6 ) name. truncate ( sep ); |