summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/.cvsignore2
-rw-r--r--core/settings/launcher/taskbarsettings.cpp23
-rw-r--r--noncore/settings/sshkeys/.cvsignore4
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 @@
1Makefile*
2moc_* \ 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
@@ -89,15 +89,16 @@ void TaskbarSettings::init ( )
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 ( );
@@ -107,5 +108,5 @@ void TaskbarSettings::init ( )
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 )
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 @@
1Makefile*
2moc_*
3sshkeysbase.cpp
4sshkeysbase.h \ No newline at end of file