7 files changed, 13 insertions, 9 deletions
diff --git a/tdeioslave/mbox/CMakeLists.txt b/tdeioslave/mbox/CMakeLists.txt
index e74682fa..27e51538 100644
--- a/tdeioslave/mbox/CMakeLists.txt
+++ b/tdeioslave/mbox/CMakeLists.txt
@@ -23,14 +23,18 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES mbox.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE mbox.protocol
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR tdeioslave-desktops
+)
 
 
 ##### tdeio_mbox (module) #########################
 
 tde_add_kpart( tdeio_mbox
   SOURCES
-    mbox.cc mboxfile.cc readmbox.cc stat.cc urlinfo.cc
+    mbox.cpp mboxfile.cpp readmbox.cpp stat.cpp urlinfo.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/mbox/Makefile.am b/tdeioslave/mbox/Makefile.am
index b95ae1b5..b890ebf3 100644
--- a/tdeioslave/mbox/Makefile.am
+++ b/tdeioslave/mbox/Makefile.am
@@ -7,11 +7,11 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = tdeio_mbox.la
 
 tdeio_mbox_la_SOURCES = \
-	mbox.cc \
-	mboxfile.cc \
-	readmbox.cc \
-	stat.cc \
-	urlinfo.cc
+	mbox.cpp \
+	mboxfile.cpp \
+	readmbox.cpp \
+	stat.cpp \
+	urlinfo.cpp
 tdeio_mbox_la_LIBADD  = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE)
 tdeio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
 
diff --git a/tdeioslave/mbox/mbox.cc b/tdeioslave/mbox/mbox.cpp
index 5742baff..62eab9b9 100644
--- a/tdeioslave/mbox/mbox.cc
+++ b/tdeioslave/mbox/mbox.cpp
@@ -34,11 +34,11 @@
 
 #include <stdlib.h>
 
-#include "tdepimmacros.h"
+#include <kdemacros.h>
 
 #include "mbox.h"
 
-extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); }
+extern "C" { TDE_EXPORT int kdemain(int argc, char* argv[]); }
 
 int kdemain( int argc, char * argv[] )
 {
diff --git a/tdeioslave/mbox/mboxfile.cc b/tdeioslave/mbox/mboxfile.cpp
index 7297457e..7297457e 100644
--- a/tdeioslave/mbox/mboxfile.cc
+++ b/tdeioslave/mbox/mboxfile.cpp
diff --git a/tdeioslave/mbox/readmbox.cc b/tdeioslave/mbox/readmbox.cpp
index 942f369e..942f369e 100644
--- a/tdeioslave/mbox/readmbox.cc
+++ b/tdeioslave/mbox/readmbox.cpp
diff --git a/tdeioslave/mbox/stat.cc b/tdeioslave/mbox/stat.cpp
index 99267ca7..99267ca7 100644
--- a/tdeioslave/mbox/stat.cc
+++ b/tdeioslave/mbox/stat.cpp
diff --git a/tdeioslave/mbox/urlinfo.cc b/tdeioslave/mbox/urlinfo.cpp
index 4b359e40..4b359e40 100644
--- a/tdeioslave/mbox/urlinfo.cc
+++ b/tdeioslave/mbox/urlinfo.cpp