-rw-r--r-- | core/settings/launcher/.cvsignore | 2 | ||||
-rw-r--r-- | core/settings/launcher/taskbarsettings.cpp | 1 |
2 files changed, 3 insertions, 0 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 @@ | |||
1 | Makefile* | ||
2 | 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 | |||
@@ -80,24 +80,25 @@ void TaskbarSettings::init ( ) | |||
80 | 80 | ||
81 | QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; | 81 | QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; |
82 | QStringList list = QDir ( path, "lib*.so" ). entryList ( ); | 82 | QStringList list = QDir ( path, "lib*.so" ). entryList ( ); |
83 | 83 | ||
84 | for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { | 84 | for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { |
85 | QString name; | 85 | QString name; |
86 | QPixmap icon; | 86 | QPixmap icon; |
87 | TaskbarNamedAppletInterface *iface = 0; | 87 | TaskbarNamedAppletInterface *iface = 0; |
88 | 88 | ||
89 | QLibrary *lib = new QLibrary ( path + "/" + *it ); | 89 | QLibrary *lib = new QLibrary ( path + "/" + *it ); |
90 | lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); | 90 | lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); |
91 | if ( iface ) { | 91 | if ( iface ) { |
92 | |||
92 | QString lang = getenv( "LANG" ); | 93 | QString lang = getenv( "LANG" ); |
93 | QTranslator *trans = new QTranslator ( qApp ); | 94 | QTranslator *trans = new QTranslator ( qApp ); |
94 | QString type = (*it). left ((*it). find (".")); | 95 | QString type = (*it). left ((*it). find (".")); |
95 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; | 96 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; |
96 | if ( trans-> load ( tfn )) | 97 | if ( trans-> load ( tfn )) |
97 | qApp-> installTranslator ( trans ); | 98 | qApp-> installTranslator ( trans ); |
98 | else | 99 | else |
99 | delete trans; | 100 | delete trans; |
100 | name = iface-> name ( ); | 101 | name = iface-> name ( ); |
101 | icon = iface-> icon ( ); | 102 | icon = iface-> icon ( ); |
102 | iface-> release ( ); | 103 | iface-> release ( ); |
103 | lib-> unload ( ); | 104 | lib-> unload ( ); |