14 files changed, 21 insertions, 24 deletions
diff --git a/tdewallet/backend/CMakeLists.txt b/tdewallet/backend/CMakeLists.txt
index 57a1e77ac..db2f66994 100644
--- a/tdewallet/backend/CMakeLists.txt
+++ b/tdewallet/backend/CMakeLists.txt
@@ -30,9 +30,9 @@ link_directories(
 set( target tdewalletbackend )
 
 set( ${target}_SRCS
-  blockcipher.cc blowfish.cc
-  cbc.cc sha1.cc tdewalletentry.cc
-  tdewalletbackend.cc
+  blockcipher.cpp blowfish.cpp
+  cbc.cpp sha1.cpp tdewalletentry.cpp
+  tdewalletbackend.cpp
 )
 
 tde_add_library( ${target} SHARED
diff --git a/tdewallet/backend/Makefile.am b/tdewallet/backend/Makefile.am
index 487385eac..a53a0129f 100644
--- a/tdewallet/backend/Makefile.am
+++ b/tdewallet/backend/Makefile.am
@@ -5,12 +5,12 @@ lib_LTLIBRARIES = libtdewalletbackend.la
 
 libtdewalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
 libtdewalletbackend_la_LIBADD = $(LIB_TQT) ../../tdecore/libtdecore.la
-libtdewalletbackend_la_SOURCES = blockcipher.cc		\
-			       blowfish.cc		\
-			       cbc.cc			\
-			       sha1.cc			\
-			       tdewalletentry.cc		\
-			       tdewalletbackend.cc
+libtdewalletbackend_la_SOURCES = blockcipher.cpp		\
+			       blowfish.cpp		\
+			       cbc.cpp			\
+			       sha1.cpp			\
+			       tdewalletentry.cpp		\
+			       tdewalletbackend.cpp
 
 
 libtdewalletbackend_la_METASOURCES = AUTO
diff --git a/tdewallet/backend/blockcipher.cc b/tdewallet/backend/blockcipher.cpp
index 9d770098e..9d770098e 100644
--- a/tdewallet/backend/blockcipher.cc
+++ b/tdewallet/backend/blockcipher.cpp
diff --git a/tdewallet/backend/blowfish.cc b/tdewallet/backend/blowfish.cpp
index c708935de..c708935de 100644
--- a/tdewallet/backend/blowfish.cc
+++ b/tdewallet/backend/blowfish.cpp
diff --git a/tdewallet/backend/blowfish.h b/tdewallet/backend/blowfish.h
index 581ac31c0..33c0c6ee1 100644
--- a/tdewallet/backend/blowfish.h
+++ b/tdewallet/backend/blowfish.h
@@ -28,9 +28,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h> /* For uintXX_t on Tru64 */
-#endif
 
 #include "blockcipher.h"
 
diff --git a/tdewallet/backend/blowfishtables.h b/tdewallet/backend/blowfishtables.h
index dae448f96..a41d7a7e3 100644
--- a/tdewallet/backend/blowfishtables.h
+++ b/tdewallet/backend/blowfishtables.h
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-// This is also from _Applied_Cryptography_.  See blowfish.cc for more details.
+// This is also from _Applied_Cryptography_.  See blowfish.cpp for more details.
 
 #ifndef __bfdefs_h
 #define __bfdefs_h
diff --git a/tdewallet/backend/cbc.cc b/tdewallet/backend/cbc.cpp
index 7bc5f3891..7bc5f3891 100644
--- a/tdewallet/backend/cbc.cc
+++ b/tdewallet/backend/cbc.cpp
diff --git a/tdewallet/backend/sha1.cc b/tdewallet/backend/sha1.cpp
index 7420b5f16..c2bb4339b 100644
--- a/tdewallet/backend/sha1.cc
+++ b/tdewallet/backend/sha1.cpp
@@ -24,12 +24,6 @@
 #include <sys/types.h>
 #endif
 #ifdef HAVE_STDINT_H
-#include <stdint.h> /* For uintXX_t on OSX */
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h> /* For uintXX_t on Tru64 */
-#endif
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
 
diff --git a/tdewallet/backend/tdewalletbackend.cc b/tdewallet/backend/tdewalletbackend.cpp
index 83e37a49a..978335e67 100644
--- a/tdewallet/backend/tdewalletbackend.cc
+++ b/tdewallet/backend/tdewalletbackend.cpp
@@ -27,7 +27,7 @@
 #include <tdelocale.h>
 #include <kmdcodec.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/tdewallet/backend/tdewalletbackend.h b/tdewallet/backend/tdewalletbackend.h
index 71c1da120..f469a9d60 100644
--- a/tdewallet/backend/tdewalletbackend.h
+++ b/tdewallet/backend/tdewalletbackend.h
@@ -36,7 +36,7 @@ class MD5Digest;
 
 /* @internal
  */
-class KDE_EXPORT Backend {
+class TDE_EXPORT Backend {
 	public:
 		Backend(const TQString& name = "kdewallet", bool isPath = false);
 		~Backend();
diff --git a/tdewallet/backend/tdewalletentry.cc b/tdewallet/backend/tdewalletentry.cpp
index d6b3aa84e..d6b3aa84e 100644
--- a/tdewallet/backend/tdewalletentry.cc
+++ b/tdewallet/backend/tdewalletentry.cpp
diff --git a/tdewallet/backend/tdewalletentry.h b/tdewallet/backend/tdewalletentry.h
index 4261fc439..9a9836208 100644
--- a/tdewallet/backend/tdewalletentry.h
+++ b/tdewallet/backend/tdewalletentry.h
@@ -31,7 +31,7 @@ namespace TDEWallet {
 
 /* @internal
  */
-class KDE_EXPORT Entry {
+class TDE_EXPORT Entry {
 	public:
 		Entry();
 		~Entry();
diff --git a/tdewallet/backend/tests/CMakeLists.txt b/tdewallet/backend/tests/CMakeLists.txt
index 275891ae7..129377791 100644
--- a/tdewallet/backend/tests/CMakeLists.txt
+++ b/tdewallet/backend/tests/CMakeLists.txt
@@ -29,9 +29,10 @@ tde_add_check_executable( backendtest AUTOMOC
     LINK tdewalletbackend-shared tdewalletclient-shared )
 add_test( NAME "tdewallet/backed/backendtest"
     COMMAND sh -x "${CMAKE_CURRENT_SOURCE_DIR}/backendtest.sh" )
+set_tests_properties( "tdewallet/backed/backendtest" PROPERTIES TIMEOUT 30)
 tde_add_check_executable( testbf AUTOMOC
-    SOURCES testbf.cpp ../blockcipher.cc ../blowfish.cc
+    SOURCES testbf.cpp ../blockcipher.cpp ../blowfish.cpp
     LINK tdewalletbackend-shared tdewalletclient-shared TEST )
 tde_add_check_executable( testsha AUTOMOC
-    SOURCES testsha.cpp ../sha1.cc
+    SOURCES testsha.cpp ../sha1.cpp
     LINK tdewalletbackend-shared tdewalletclient-shared TEST )
diff --git a/tdewallet/backend/tests/backendtest.sh b/tdewallet/backend/tests/backendtest.sh
index d3a6ef0e1..d4f1ba686 100644
--- a/tdewallet/backend/tests/backendtest.sh
+++ b/tdewallet/backend/tests/backendtest.sh
@@ -3,11 +3,16 @@
 # create temporary home
 export HOME=$PWD/test-home
 mkdir $HOME
+export ICEAUTHORITY=$HOME/.ICEauthority
 
 # run dcop server
 ../../../dcop/dcopserver --nofork &
 DCOP_SERVER_PID=$!
 
+while ! ../../../dcop/dcopserver --serverid 2>/dev/null; do
+  sleep 2
+done
+
 # perform test
 ./backendtest
 STATE=$?