| author | harlekin <harlekin> | 2002-09-21 18:13:18 (UTC) |
|---|---|---|
| committer | harlekin <harlekin> | 2002-09-21 18:13:18 (UTC) |
| commit | 3838d736783c5d33197cb8d99f611ab214460bd9 (patch) (unidiff) | |
| tree | 654ac2c3344791245d3efd0eacfaf71f680d4bd7 | |
| 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 | ||||
| -rw-r--r-- | noncore/settings/sshkeys/.cvsignore | 4 |
3 files changed, 18 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 @@ | |||
| 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 | |||
| @@ -88,17 +88,18 @@ void TaskbarSettings::init ( ) | |||
| 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 | QString lang = getenv( "LANG" ); | 92 | |
| 93 | QTranslator *trans = new QTranslator ( qApp ); | 93 | QString lang = getenv( "LANG" ); |
| 94 | QString type = (*it). left ((*it). find (".")); | 94 | QTranslator *trans = new QTranslator ( qApp ); |
| 95 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; | 95 | QString type = (*it). left ((*it). find (".")); |
| 96 | if ( trans-> load ( tfn )) | 96 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; |
| 97 | qApp-> installTranslator ( trans ); | 97 | if ( trans-> load ( tfn )) |
| 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 ( ); |
| 104 | } else { | 105 | } else { |
| @@ -106,7 +107,7 @@ void TaskbarSettings::init ( ) | |||
| 106 | name = (*it). mid ( 3 ); | 107 | name = (*it). mid ( 3 ); |
| 107 | int sep = name. find( ".so" ); | 108 | int sep = name. find( ".so" ); |
| 108 | if ( sep > 0 ) | 109 | if ( sep > 0 ) |
| 109 | name. truncate ( sep ); | 110 | name. truncate ( sep ); |
| 110 | sep = name. find ( "applet" ); | 111 | sep = name. find ( "applet" ); |
| 111 | if ( sep == (int) name.length ( ) - 6 ) | 112 | if ( sep == (int) name.length ( ) - 6 ) |
| 112 | name. truncate ( sep ); | 113 | name. truncate ( sep ); |
diff --git a/noncore/settings/sshkeys/.cvsignore b/noncore/settings/sshkeys/.cvsignore new file mode 100644 index 0000000..19bace6 --- a/dev/null +++ b/noncore/settings/sshkeys/.cvsignore | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | Makefile* | ||
| 2 | moc_* | ||
| 3 | sshkeysbase.cpp | ||
| 4 | sshkeysbase.h \ No newline at end of file | ||