summaryrefslogtreecommitdiffstats
path: root/kcontrol/smartcard
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/smartcard
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/smartcard')
-rw-r--r--kcontrol/smartcard/smartcard.cpp2
-rw-r--r--kcontrol/smartcard/smartcard.desktop2
2 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index acc66880e..2105c34d0 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -32,7 +32,7 @@
#include <kcarddb.h>
#include <kcardfactory.h>
#include <kcardgsm_impl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kglobal.h>
diff --git a/kcontrol/smartcard/smartcard.desktop b/kcontrol/smartcard/smartcard.desktop
index c347590e4..600aea709 100644
--- a/kcontrol/smartcard/smartcard.desktop
+++ b/kcontrol/smartcard/smartcard.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=identity
Type=Application
-Exec=kcmshell smartcard
+Exec=tdecmshell smartcard
DocPath=kcontrol/smartcard.html
X-TDE-Library=smartcard