diff options
Diffstat (limited to 'tdeioslave/ldap')
| -rw-r--r-- | tdeioslave/ldap/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tdeioslave/ldap/Makefile.am | 10 | ||||
| -rw-r--r-- | tdeioslave/ldap/ldap.protocol | 2 | ||||
| -rw-r--r-- | tdeioslave/ldap/ldaps.protocol | 2 | ||||
| -rw-r--r-- | tdeioslave/ldap/tdeio_ldap.cpp (renamed from tdeioslave/ldap/kio_ldap.cpp) | 16 | ||||
| -rw-r--r-- | tdeioslave/ldap/tdeio_ldap.h (renamed from tdeioslave/ldap/kio_ldap.h) | 0 |
6 files changed, 18 insertions, 18 deletions
diff --git a/tdeioslave/ldap/CMakeLists.txt b/tdeioslave/ldap/CMakeLists.txt index ebf162205..d05048e0d 100644 --- a/tdeioslave/ldap/CMakeLists.txt +++ b/tdeioslave/ldap/CMakeLists.txt @@ -28,10 +28,10 @@ link_directories( install( FILES ldap.protocol ldaps.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -##### kio_ldap (module) ######################### +##### tdeio_ldap (module) ######################### -tde_add_kpart( kio_ldap AUTOMOC - SOURCES kio_ldap.cpp +tde_add_kpart( tdeio_ldap AUTOMOC + SOURCES tdeio_ldap.cpp LINK kabc-shared ${LDAP_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeioslave/ldap/Makefile.am b/tdeioslave/ldap/Makefile.am index ca66e1b17..3f71b669b 100644 --- a/tdeioslave/ldap/Makefile.am +++ b/tdeioslave/ldap/Makefile.am @@ -7,13 +7,13 @@ LDADD = $(LIB_KIO) $(LDAP_LIBS) ####### Files -kde_module_LTLIBRARIES = kio_ldap.la +kde_module_LTLIBRARIES = tdeio_ldap.la -kio_ldap_la_SOURCES = kio_ldap.cpp -kio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_KABC) -kio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN) +tdeio_ldap_la_SOURCES = tdeio_ldap.cpp +tdeio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_KABC) +tdeio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN) -noinst_HEADERS = kio_ldap.h +noinst_HEADERS = tdeio_ldap.h kdelnk_DATA = ldap.protocol ldaps.protocol kdelnkdir = $(kde_servicesdir) diff --git a/tdeioslave/ldap/ldap.protocol b/tdeioslave/ldap/ldap.protocol index 3e1e77b4b..3082c6cb7 100644 --- a/tdeioslave/ldap/ldap.protocol +++ b/tdeioslave/ldap/ldap.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_ldap +exec=tdeio_ldap protocol=ldap input=none output=filesystem diff --git a/tdeioslave/ldap/ldaps.protocol b/tdeioslave/ldap/ldaps.protocol index 1dd927506..2bcb2234c 100644 --- a/tdeioslave/ldap/ldaps.protocol +++ b/tdeioslave/ldap/ldaps.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_ldap +exec=tdeio_ldap protocol=ldaps input=none output=filesystem diff --git a/tdeioslave/ldap/kio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp index d4a29f1d4..2e22e6994 100644 --- a/tdeioslave/ldap/kio_ldap.cpp +++ b/tdeioslave/ldap/tdeio_ldap.cpp @@ -22,7 +22,7 @@ #endif #include <kabc/ldif.h> -#include "kio_ldap.h" +#include "tdeio_ldap.h" using namespace TDEIO; using namespace KABC; @@ -34,12 +34,12 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } */ int kdemain( int argc, char **argv ) { - TDEInstance instance( "kio_ldap" ); + TDEInstance instance( "tdeio_ldap" ); kdDebug(7125) << "Starting " << getpid() << endl; if ( argc != 4 ) { - kdError() << "Usage kio_ldap protocol pool app" << endl; + kdError() << "Usage tdeio_ldap protocol pool app" << endl; return -1; } @@ -93,7 +93,7 @@ void LDAPProtocol::LDAPErr( const KURL &url, int err ) closeConnection(); switch (err) { -/* FIXME: is it worth mapping the following error codes to kio errors? +/* FIXME: is it worth mapping the following error codes to tdeio errors? LDAP_OPERATIONS_ERROR LDAP_STRONG_AUTH_REQUIRED @@ -943,14 +943,14 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool ) FREELDAPMEM; return; case LDIF::Entry_Del: - kdDebug(7125) << "kio_ldap_del" << endl; + kdDebug(7125) << "tdeio_ldap_del" << endl; controlsFromMetaData( &serverctrls, &clientctrls ); ldaperr = ldap_delete_ext_s( mLDAP, ldif.dn().utf8(), serverctrls, clientctrls ); FREELDAPMEM; break; case LDIF::Entry_Modrdn: - kdDebug(7125) << "kio_ldap_modrdn olddn:" << ldif.dn() << + kdDebug(7125) << "tdeio_ldap_modrdn olddn:" << ldif.dn() << " newRdn: " << ldif.newRdn() << " newSuperior: " << ldif.newSuperior() << " deloldrdn: " << ldif.delOldRdn() << endl; @@ -962,7 +962,7 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool ) FREELDAPMEM; break; case LDIF::Entry_Mod: - kdDebug(7125) << "kio_ldap_mod" << endl; + kdDebug(7125) << "tdeio_ldap_mod" << endl; if ( lmod ) { controlsFromMetaData( &serverctrls, &clientctrls ); ldaperr = ldap_modify_ext_s( mLDAP, ldif.dn().utf8(), lmod, @@ -971,7 +971,7 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool ) } break; case LDIF::Entry_Add: - kdDebug(7125) << "kio_ldap_add " << ldif.dn() << endl; + kdDebug(7125) << "tdeio_ldap_add " << ldif.dn() << endl; if ( lmod ) { controlsFromMetaData( &serverctrls, &clientctrls ); ldaperr = ldap_add_ext_s( mLDAP, ldif.dn().utf8(), lmod, diff --git a/tdeioslave/ldap/kio_ldap.h b/tdeioslave/ldap/tdeio_ldap.h index f3bd61fe5..f3bd61fe5 100644 --- a/tdeioslave/ldap/kio_ldap.h +++ b/tdeioslave/ldap/tdeio_ldap.h |