Rename kioslaves

pull/21/head
Timothy Pearson 12 years ago
parent c9e6160b80
commit b94985f2c0

@ -2,11 +2,11 @@ SUBDIRS = mimetypes
INCLUDES = -I$(top_srcdir)/kmobile -I$(top_srcdir) $(all_includes) INCLUDES = -I$(top_srcdir)/kmobile -I$(top_srcdir) $(all_includes)
kde_module_LTLIBRARIES = kio_mobile.la kde_module_LTLIBRARIES = tdeio_mobile.la
kio_mobile_la_SOURCES = kio_mobile.cpp tdeio_mobile_la_SOURCES = tdeio_mobile.cpp
kio_mobile_la_LIBADD = $(LIB_KIO) ../libkmobileclient.la tdeio_mobile_la_LIBADD = $(LIB_KIO) ../libkmobileclient.la
kio_mobile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) tdeio_mobile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
kde_services_DATA = mobile.protocol cellphone.protocol \ kde_services_DATA = mobile.protocol cellphone.protocol \
organizer.protocol pda.protocol organizer.protocol pda.protocol

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_mobile exec=tdeio_mobile
protocol=cellphone protocol=cellphone
input=none input=none
output=filesystem output=filesystem

@ -31,14 +31,14 @@
#include <kinstance.h> #include <kinstance.h>
#include <kabc/vcardconverter.h> #include <kabc/vcardconverter.h>
#include "kio_mobile.h" #include "tdeio_mobile.h"
#include <tdepimmacros.h> #include <tdepimmacros.h>
using namespace TDEIO; using namespace TDEIO;
#define KIO_MOBILE_DEBUG_AREA 7126 #define KIO_MOBILE_DEBUG_AREA 7126
#define PRINT_DEBUG kdDebug(KIO_MOBILE_DEBUG_AREA) << "kio_mobile: " #define PRINT_DEBUG kdDebug(KIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: "
extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
@ -47,12 +47,12 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
*/ */
int kdemain(int argc, char **argv) int kdemain(int argc, char **argv)
{ {
TDEInstance instance( "kio_mobile" ); TDEInstance instance( "tdeio_mobile" );
PRINT_DEBUG << "Starting " << getpid() << endl; PRINT_DEBUG << "Starting " << getpid() << endl;
if (argc != 4) { if (argc != 4) {
fprintf(stderr, "Usage kio_mobile protocol pool app\n"); fprintf(stderr, "Usage tdeio_mobile protocol pool app\n");
return -1; return -1;
} }
// let the protocol class do its work // let the protocol class do its work

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_mobile exec=tdeio_mobile
protocol=mobile protocol=mobile
input=none input=none
output=filesystem output=filesystem

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_mobile exec=tdeio_mobile
protocol=organizer protocol=organizer
input=none input=none
output=filesystem output=filesystem

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_mobile exec=tdeio_mobile
protocol=pda protocol=pda
input=none input=none
output=filesystem output=filesystem

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_mobile exec=tdeio_mobile
protocol=camera protocol=camera
input=none input=none
output=filesystem output=filesystem

@ -1,6 +1,6 @@
## $Id$ ## $Id$
if compile_kio_sieve if compile_tdeio_sieve
SIEVE_SUBDIR = sieve SIEVE_SUBDIR = sieve
endif endif

@ -24,4 +24,4 @@ fi
AC_SUBST(SASL2_LIBS) AC_SUBST(SASL2_LIBS)
AM_CONDITIONAL(compile_kio_sieve, test -n "$SASL2_LIBS") AM_CONDITIONAL(compile_tdeio_sieve, test -n "$SASL2_LIBS")

@ -32,9 +32,9 @@ install( FILES
DESTINATION ${SERVICES_INSTALL_DIR} ) DESTINATION ${SERVICES_INSTALL_DIR} )
##### kio_imap4 (module) ######################## ##### tdeio_imap4 (module) ########################
tde_add_kpart( kio_imap4 tde_add_kpart( tdeio_imap4
SOURCES SOURCES
imapcommand.cc imaplist.cc mailaddress.cc mimeheader.cc imapcommand.cc imaplist.cc mailaddress.cc mimeheader.cc
rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc

@ -5,14 +5,14 @@ INCLUDES= -I$(top_srcdir)/libkmime \
####### Files ####### Files
kde_module_LTLIBRARIES = kio_imap4.la kde_module_LTLIBRARIES = tdeio_imap4.la
kio_imap4_la_SOURCES = imapcommand.cc imaplist.cc mailaddress.cc \ tdeio_imap4_la_SOURCES = imapcommand.cc imaplist.cc mailaddress.cc \
mimeheader.cc rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc mailheader.cc \ mimeheader.cc rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc mailheader.cc \
mimehdrline.cc mimeio.cc mimehdrline.cc mimeio.cc
kio_imap4_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) ../../libkmime/libkmime.la \ tdeio_imap4_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) ../../libkmime/libkmime.la \
../../libemailfunctions/libemailfunctions.la ../../libemailfunctions/libemailfunctions.la
kio_imap4_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) tdeio_imap4_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
noinst_HEADERS = imap4.h noinst_HEADERS = imap4.h
EXTRA_DIST = README EXTRA_DIST = README

@ -109,10 +109,10 @@ kdemain (int argc, char **argv)
{ {
kdDebug(7116) << "IMAP4::kdemain" << endl; kdDebug(7116) << "IMAP4::kdemain" << endl;
TDEInstance instance ("kio_imap4"); TDEInstance instance ("tdeio_imap4");
if (argc != 4) if (argc != 4)
{ {
fprintf(stderr, "Usage: kio_imap4 protocol domain-socket1 domain-socket2\n"); fprintf(stderr, "Usage: tdeio_imap4 protocol domain-socket1 domain-socket2\n");
::exit (-1); ::exit (-1);
} }
@ -2157,7 +2157,7 @@ bool IMAP4Protocol::makeLogin ()
myPass = authInfo.password; myPass = authInfo.password;
} }
#else #else
error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_imap4.")); error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into tdeio_imap4."));
#endif #endif
} }
if ( hasCapability("NAMESPACE") ) if ( hasCapability("NAMESPACE") )

@ -1,7 +1,7 @@
[Protocol] [Protocol]
# The executable, of course # The executable, of course
#### Temporary name #### Temporary name
exec=kio_imap4 exec=tdeio_imap4
# protocol that will appear in URLs # protocol that will appear in URLs
protocol=imap protocol=imap

@ -1,7 +1,7 @@
[Protocol] [Protocol]
# The executable, of course # The executable, of course
#### Temporary name #### Temporary name
exec=kio_imap4 exec=tdeio_imap4
# protocol that will appear in URLs # protocol that will appear in URLs
#### This ioslave is temporarily named imaps, while imaps remains in tdebase #### This ioslave is temporarily named imaps, while imaps remains in tdebase
protocol=imaps protocol=imaps

@ -26,9 +26,9 @@ link_directories(
install( FILES mbox.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES mbox.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
##### kio_mbox (module) ######################### ##### tdeio_mbox (module) #########################
tde_add_kpart( kio_mbox tde_add_kpart( tdeio_mbox
SOURCES SOURCES
mbox.cc mboxfile.cc readmbox.cc stat.cc urlinfo.cc mbox.cc mboxfile.cc readmbox.cc stat.cc urlinfo.cc
LINK tdeio-shared LINK tdeio-shared

@ -4,16 +4,16 @@ INCLUDES= $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_mbox.la kde_module_LTLIBRARIES = tdeio_mbox.la
kio_mbox_la_SOURCES = \ tdeio_mbox_la_SOURCES = \
mbox.cc \ mbox.cc \
mboxfile.cc \ mboxfile.cc \
readmbox.cc \ readmbox.cc \
stat.cc \ stat.cc \
urlinfo.cc urlinfo.cc
kio_mbox_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) tdeio_mbox_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
kio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) tdeio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
noinst_HEADERS = \ noinst_HEADERS = \
mbox.h \ mbox.h \

@ -1,4 +1,4 @@
This is a simple tdeioslave for accessing mbox-files with kio. This is a simple tdeioslave for accessing mbox-files with tdeio.
At the moment, it doesn't support locking or writing, it is just reading and listing messages. At the moment, it doesn't support locking or writing, it is just reading and listing messages.

@ -43,11 +43,11 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); }
int kdemain( int argc, char * argv[] ) int kdemain( int argc, char * argv[] )
{ {
KLocale::setMainCatalogue("tdelibs"); KLocale::setMainCatalogue("tdelibs");
TDEInstance instance("kio_mbox"); TDEInstance instance("tdeio_mbox");
(void) TDEGlobal::locale(); (void) TDEGlobal::locale();
if (argc != 4) { if (argc != 4) {
fprintf(stderr, "Usage: kio_mbox protocol " fprintf(stderr, "Usage: tdeio_mbox protocol "
"domain-socket1 domain-socket2\n"); "domain-socket1 domain-socket2\n");
exit(-1); exit(-1);
} }

@ -67,7 +67,7 @@ public:
/** /**
* Through this functions, other class which have an instance to this * Through this functions, other class which have an instance to this
* class (classes which are part of kio_mbox) can emit an error with * class (classes which are part of tdeio_mbox) can emit an error with
* this function * this function
* @param errno The error number to be thrown * @param errno The error number to be thrown
* @param arg The argument of the error message of the error number. * @param arg The argument of the error message of the error number.

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_mbox exec=tdeio_mbox
protocol=mbox protocol=mbox
input=none input=none
output=filesystem output=filesystem

@ -8,10 +8,10 @@ METASOURCES = AUTO
kdelnkdir = $(kde_servicesdir) kdelnkdir = $(kde_servicesdir)
kdelnk_DATA = opengroupware.protocol opengroupwares.protocol kdelnk_DATA = opengroupware.protocol opengroupwares.protocol
kde_module_LTLIBRARIES = kio_opengroupware.la kde_module_LTLIBRARIES = tdeio_opengroupware.la
kio_opengroupware_la_SOURCES = opengroupware.cpp webdavhandler.cpp tdeio_opengroupware_la_SOURCES = opengroupware.cpp webdavhandler.cpp
kio_opengroupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ tdeio_opengroupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
kio_opengroupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_opengroupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

@ -69,12 +69,12 @@ KDE_EXPORT int kdemain( int argc, char **argv );
int kdemain( int argc, char **argv ) int kdemain( int argc, char **argv )
{ {
TDEInstance instance( "kio_OpenGroupware" ); TDEInstance instance( "tdeio_OpenGroupware" );
kdDebug(7000) << "Starting kio_OpenGroupware(pid: " << getpid() << ")" << endl; kdDebug(7000) << "Starting tdeio_OpenGroupware(pid: " << getpid() << ")" << endl;
if (argc != 4) { if (argc != 4) {
fprintf( stderr, "Usage: kio_OpenGroupware protocol domain-socket1 domain-socket2\n"); fprintf( stderr, "Usage: tdeio_OpenGroupware protocol domain-socket1 domain-socket2\n");
exit( -1 ); exit( -1 );
} }

@ -1,6 +1,6 @@
[Protocol] [Protocol]
DocPath=tdeioslave/opengroupware.html DocPath=tdeioslave/opengroupware.html
exec=kio_opengroupware exec=tdeio_opengroupware
input=none input=none
output=filesystem output=filesystem
protocol=opengroupware protocol=opengroupware

@ -1,6 +1,6 @@
[Protocol] [Protocol]
DocPath=tdeioslave/opengroupware.html DocPath=tdeioslave/opengroupware.html
exec=kio_opengroupware exec=tdeio_opengroupware
input=none input=none
output=filesystem output=filesystem
protocol=opengroupwares protocol=opengroupwares

@ -26,9 +26,9 @@ link_directories(
install( FILES sieve.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES sieve.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
##### kio_sieve (module) ######################## ##### tdeio_sieve (module) ########################
tde_add_kpart( kio_sieve tde_add_kpart( tdeio_sieve
SOURCES sieve.cpp SOURCES sieve.cpp
LINK tdeio-shared ${SASL_LIBRARY} LINK tdeio-shared ${SASL_LIBRARY}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,10 +1,10 @@
INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes) INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
kde_module_LTLIBRARIES = kio_sieve.la kde_module_LTLIBRARIES = tdeio_sieve.la
kio_sieve_la_SOURCES = sieve.cpp tdeio_sieve_la_SOURCES = sieve.cpp
kio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_TDECORE) tdeio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_TDECORE)
kio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = sieve.h noinst_HEADERS = sieve.h

@ -82,12 +82,12 @@ extern "C"
{ {
KDE_EXPORT int kdemain(int argc, char **argv) KDE_EXPORT int kdemain(int argc, char **argv)
{ {
TDEInstance instance("kio_sieve" ); TDEInstance instance("tdeio_sieve" );
ksDebug() << "*** Starting kio_sieve " << endl; ksDebug() << "*** Starting tdeio_sieve " << endl;
if (argc != 4) { if (argc != 4) {
ksDebug() << "Usage: kio_sieve protocol domain-socket1 domain-socket2" << endl; ksDebug() << "Usage: tdeio_sieve protocol domain-socket1 domain-socket2" << endl;
exit(-1); exit(-1);
} }
@ -101,88 +101,88 @@ extern "C"
sasl_done(); sasl_done();
ksDebug() << "*** kio_sieve Done" << endl; ksDebug() << "*** tdeio_sieve Done" << endl;
return 0; return 0;
} }
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
kio_sieveResponse::kio_sieveResponse() tdeio_sieveResponse::kio_sieveResponse()
{ {
clear(); clear();
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
const uint& kio_sieveResponse::getType() const const uint& tdeio_sieveResponse::getType() const
{ {
return rType; return rType;
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
const uint kio_sieveResponse::getQuantity() const const uint tdeio_sieveResponse::getQuantity() const
{ {
return quantity; return quantity;
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
const TQCString& kio_sieveResponse::getAction() const const TQCString& tdeio_sieveResponse::getAction() const
{ {
return key; return key;
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
const TQCString& kio_sieveResponse::getKey() const const TQCString& tdeio_sieveResponse::getKey() const
{ {
return key; return key;
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
const TQCString& kio_sieveResponse::getVal() const const TQCString& tdeio_sieveResponse::getVal() const
{ {
return val; return val;
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
const TQCString& kio_sieveResponse::getExtra() const const TQCString& tdeio_sieveResponse::getExtra() const
{ {
return extra; return extra;
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveResponse::setQuantity(const uint& newTQty) void tdeio_sieveResponse::setQuantity(const uint& newTQty)
{ {
rType = QUANTITY; rType = QUANTITY;
quantity = newTQty; quantity = newTQty;
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveResponse::setAction(const TQCString& newAction) void tdeio_sieveResponse::setAction(const TQCString& newAction)
{ {
rType = ACTION; rType = ACTION;
key = newAction.copy(); key = newAction.copy();
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveResponse::setKey(const TQCString& newKey) void tdeio_sieveResponse::setKey(const TQCString& newKey)
{ {
rType = KEY_VAL_PAIR; rType = KEY_VAL_PAIR;
key = newKey.copy(); key = newKey.copy();
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveResponse::setVal(const TQCString& newVal) void tdeio_sieveResponse::setVal(const TQCString& newVal)
{ {
val = newVal.copy(); val = newVal.copy();
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveResponse::setExtra(const TQCString& newExtra) void tdeio_sieveResponse::setExtra(const TQCString& newExtra)
{ {
extra = newExtra.copy(); extra = newExtra.copy();
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveResponse::clear() void tdeio_sieveResponse::clear()
{ {
rType = NONE; rType = NONE;
extra = key = val = TQCString(""); extra = key = val = TQCString("");
@ -190,7 +190,7 @@ void kio_sieveResponse::clear()
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
kio_sieveProtocol::kio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket) tdeio_sieveProtocol::kio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: TCPSlaveBase( SIEVE_DEFAULT_PORT, "sieve", pool_socket, app_socket, false) : TCPSlaveBase( SIEVE_DEFAULT_PORT, "sieve", pool_socket, app_socket, false)
, m_connMode(NORMAL) , m_connMode(NORMAL)
, m_supportsTLS(false) , m_supportsTLS(false)
@ -200,14 +200,14 @@ kio_sieveProtocol::kio_sieveProtocol(const TQCString &pool_socket, const TQCStri
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
kio_sieveProtocol::~kio_sieveProtocol() tdeio_sieveProtocol::~kio_sieveProtocol()
{ {
if ( isConnectionValid() ) if ( isConnectionValid() )
disconnect(); disconnect();
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveProtocol::setHost (const TQString &host, int port, const TQString &user, const TQString &pass) void tdeio_sieveProtocol::setHost (const TQString &host, int port, const TQString &user, const TQString &pass)
{ {
if ( isConnectionValid() && if ( isConnectionValid() &&
( m_sServer != host || ( m_sServer != host ||
@ -224,13 +224,13 @@ void kio_sieveProtocol::setHost (const TQString &host, int port, const TQString
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveProtocol::openConnection() void tdeio_sieveProtocol::openConnection()
{ {
m_connMode = CONNECTION_ORIENTED; m_connMode = CONNECTION_ORIENTED;
connect(); connect();
} }
bool kio_sieveProtocol::parseCapabilities(bool requestCapabilities/* = false*/) bool tdeio_sieveProtocol::parseCapabilities(bool requestCapabilities/* = false*/)
{ {
ksDebug() << k_funcinfo << endl; ksDebug() << k_funcinfo << endl;
@ -244,7 +244,7 @@ bool kio_sieveProtocol::parseCapabilities(bool requestCapabilities/* = false*/)
while (receiveData()) { while (receiveData()) {
ksDebug() << "Looping receive" << endl; ksDebug() << "Looping receive" << endl;
if (r.getType() == kio_sieveResponse::ACTION) { if (r.getType() == tdeio_sieveResponse::ACTION) {
if ( r.getAction().contains("ok", false) != -1 ) { if ( r.getAction().contains("ok", false) != -1 ) {
ksDebug() << "Sieve server ready & awaiting authentication." << endl; ksDebug() << "Sieve server ready & awaiting authentication." << endl;
break; break;
@ -294,7 +294,7 @@ bool kio_sieveProtocol::parseCapabilities(bool requestCapabilities/* = false*/)
* Checks if connection parameters have changed. * Checks if connection parameters have changed.
* If it it, close the current connection * If it it, close the current connection
*/ */
void kio_sieveProtocol::changeCheck( const KURL &url ) void tdeio_sieveProtocol::changeCheck( const KURL &url )
{ {
TQString auth; TQString auth;
@ -334,7 +334,7 @@ void kio_sieveProtocol::changeCheck( const KURL &url )
* Connects to the server. * Connects to the server.
* returns false and calls error() if an error occurred. * returns false and calls error() if an error occurred.
*/ */
bool kio_sieveProtocol::connect(bool useTLSIfAvailable) bool tdeio_sieveProtocol::connect(bool useTLSIfAvailable)
{ {
ksDebug() << k_funcinfo << endl; ksDebug() << k_funcinfo << endl;
@ -427,14 +427,14 @@ bool kio_sieveProtocol::connect(bool useTLSIfAvailable)
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveProtocol::closeConnection() void tdeio_sieveProtocol::closeConnection()
{ {
m_connMode = CONNECTION_ORIENTED; m_connMode = CONNECTION_ORIENTED;
disconnect(); disconnect();
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveProtocol::disconnect(bool forcibly) void tdeio_sieveProtocol::disconnect(bool forcibly)
{ {
if (!forcibly) { if (!forcibly) {
sendData("LOGOUT"); sendData("LOGOUT");
@ -451,7 +451,7 @@ void kio_sieveProtocol::disconnect(bool forcibly)
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
/*void kio_sieveProtocol::slave_status() /*void tdeio_sieveProtocol::slave_status()
{ {
slaveStatus(isConnectionValid() ? m_sServer : "", isConnectionValid()); slaveStatus(isConnectionValid() ? m_sServer : "", isConnectionValid());
@ -459,7 +459,7 @@ void kio_sieveProtocol::disconnect(bool forcibly)
}*/ }*/
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveProtocol::special(const TQByteArray &data) void tdeio_sieveProtocol::special(const TQByteArray &data)
{ {
int tmp; int tmp;
TQDataStream stream(data, IO_ReadOnly); TQDataStream stream(data, IO_ReadOnly);
@ -488,7 +488,7 @@ void kio_sieveProtocol::special(const TQByteArray &data)
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
bool kio_sieveProtocol::activate(const KURL& url) bool tdeio_sieveProtocol::activate(const KURL& url)
{ {
changeCheck( url ); changeCheck( url );
if (!connect()) if (!connect())
@ -516,7 +516,7 @@ bool kio_sieveProtocol::activate(const KURL& url)
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
bool kio_sieveProtocol::deactivate() bool tdeio_sieveProtocol::deactivate()
{ {
if (!connect()) if (!connect())
return false; return false;
@ -550,7 +550,7 @@ static void append_lf2crlf( TQByteArray & out, const TQByteArray & in ) {
out.resize( d - out.begin() ); out.resize( d - out.begin() );
} }
void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwrite*/, bool /*resume*/) void tdeio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwrite*/, bool /*resume*/)
{ {
changeCheck( url ); changeCheck( url );
if (!connect()) if (!connect())
@ -661,7 +661,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri
// send the extra message off for re-processing // send the extra message off for re-processing
receiveData(false, &extra); receiveData(false, &extra);
if (r.getType() == kio_sieveResponse::QUANTITY) { if (r.getType() == tdeio_sieveResponse::QUANTITY) {
// length of the error message // length of the error message
uint len = r.getQuantity(); uint len = r.getQuantity();
@ -676,7 +676,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri
// clear the rest of the incoming data // clear the rest of the incoming data
receiveData(); receiveData();
} else if (r.getType() == kio_sieveResponse::KEY_VAL_PAIR) { } else if (r.getType() == tdeio_sieveResponse::KEY_VAL_PAIR) {
error(ERR_INTERNAL_SERVER, error(ERR_INTERNAL_SERVER,
i18n("The script did not upload successfully.\n" i18n("The script did not upload successfully.\n"
"This is probably due to errors in the script.\n" "This is probably due to errors in the script.\n"
@ -716,7 +716,7 @@ static void inplace_crlf2lf( TQByteArray & in ) {
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
void kio_sieveProtocol::get(const KURL& url) void tdeio_sieveProtocol::get(const KURL& url)
{ {
changeCheck( url ); changeCheck( url );
if (!connect()) if (!connect())
@ -736,7 +736,7 @@ void kio_sieveProtocol::get(const KURL& url)
if (!sendData("GETSCRIPT \"" + filename.utf8() + "\"")) if (!sendData("GETSCRIPT \"" + filename.utf8() + "\""))
return; return;
if (receiveData() && r.getType() == kio_sieveResponse::QUANTITY) { if (receiveData() && r.getType() == tdeio_sieveResponse::QUANTITY) {
// determine script size // determine script size
ssize_t total_len = r.getQuantity(); ssize_t total_len = r.getQuantity();
totalSize( total_len ); totalSize( total_len );
@ -788,7 +788,7 @@ void kio_sieveProtocol::get(const KURL& url)
finished(); finished();
} }
void kio_sieveProtocol::del(const KURL &url, bool isfile) void tdeio_sieveProtocol::del(const KURL &url, bool isfile)
{ {
if (!isfile) { if (!isfile) {
error(ERR_INTERNAL, i18n("Folders are not supported.")); error(ERR_INTERNAL, i18n("Folders are not supported."));
@ -823,7 +823,7 @@ void kio_sieveProtocol::del(const KURL &url, bool isfile)
finished(); finished();
} }
void kio_sieveProtocol::chmod(const KURL& url, int permissions) void tdeio_sieveProtocol::chmod(const KURL& url, int permissions)
{ {
switch ( permissions ) { switch ( permissions ) {
case 0700: // activate case 0700: // activate
@ -844,7 +844,7 @@ void kio_sieveProtocol::chmod(const KURL& url, int permissions)
#undef stat #undef stat
#endif #endif
void kio_sieveProtocol::stat(const KURL& url) void tdeio_sieveProtocol::stat(const KURL& url)
{ {
changeCheck( url ); changeCheck( url );
if (!connect()) if (!connect())
@ -875,7 +875,7 @@ void kio_sieveProtocol::stat(const KURL& url)
return; return;
while(receiveData()) { while(receiveData()) {
if (r.getType() == kio_sieveResponse::ACTION) { if (r.getType() == tdeio_sieveResponse::ACTION) {
if (r.getAction().contains("OK", false) == 1) if (r.getAction().contains("OK", false) == 1)
// Script list completed // Script list completed
break; break;
@ -916,7 +916,7 @@ void kio_sieveProtocol::stat(const KURL& url)
finished(); finished();
} }
void kio_sieveProtocol::listDir(const KURL& url) void tdeio_sieveProtocol::listDir(const KURL& url)
{ {
changeCheck( url ); changeCheck( url );
if (!connect()) if (!connect())
@ -928,7 +928,7 @@ void kio_sieveProtocol::listDir(const KURL& url)
UDSEntry entry; UDSEntry entry;
while(receiveData()) { while(receiveData()) {
if (r.getType() == kio_sieveResponse::ACTION) { if (r.getType() == tdeio_sieveResponse::ACTION) {
if (r.getAction().contains("OK", false) == 1) if (r.getAction().contains("OK", false) == 1)
// Script list completed. // Script list completed.
break; break;
@ -969,7 +969,7 @@ void kio_sieveProtocol::listDir(const KURL& url)
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
bool kio_sieveProtocol::saslInteract( void *in, AuthInfo &ai ) bool tdeio_sieveProtocol::saslInteract( void *in, AuthInfo &ai )
{ {
ksDebug() << "sasl_interact" << endl; ksDebug() << "sasl_interact" << endl;
sasl_interact_t *interact = ( sasl_interact_t * ) in; sasl_interact_t *interact = ( sasl_interact_t * ) in;
@ -1019,7 +1019,7 @@ bool kio_sieveProtocol::saslInteract( void *in, AuthInfo &ai )
#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").arg( \ #define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").arg( \
TQString::fromUtf8( sasl_errdetail( conn ) ))); TQString::fromUtf8( sasl_errdetail( conn ) )));
bool kio_sieveProtocol::authenticate() bool tdeio_sieveProtocol::authenticate()
{ {
int result; int result;
sasl_conn_t *conn = NULL; sasl_conn_t *conn = NULL;
@ -1105,7 +1105,7 @@ bool kio_sieveProtocol::authenticate()
ksDebug() << "Challenge len " << r.getQuantity() << endl; ksDebug() << "Challenge len " << r.getQuantity() << endl;
if (r.getType() != kio_sieveResponse::QUANTITY) { if (r.getType() != tdeio_sieveResponse::QUANTITY) {
sasl_dispose( &conn ); sasl_dispose( &conn );
error(ERR_SLAVE_DEFINED, error(ERR_SLAVE_DEFINED,
i18n("A protocol error occurred during authentication.\n" i18n("A protocol error occurred during authentication.\n"
@ -1117,7 +1117,7 @@ bool kio_sieveProtocol::authenticate()
receiveData(); receiveData();
if (r.getType() != kio_sieveResponse::ACTION && r.getAction().length() != qty) { if (r.getType() != tdeio_sieveResponse::ACTION && r.getAction().length() != qty) {
sasl_dispose( &conn ); sasl_dispose( &conn );
error(ERR_UNSUPPORTED_PROTOCOL, error(ERR_UNSUPPORTED_PROTOCOL,
i18n("A protocol error occurred during authentication.\n" i18n("A protocol error occurred during authentication.\n"
@ -1174,7 +1174,7 @@ bool kio_sieveProtocol::authenticate()
} }
/* --------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------- */
void kio_sieveProtocol::mimetype(const KURL & url) void tdeio_sieveProtocol::mimetype(const KURL & url)
{ {
ksDebug() << "Requesting mimetype for " << url.prettyURL() << endl; ksDebug() << "Requesting mimetype for " << url.prettyURL() << endl;
@ -1188,7 +1188,7 @@ void kio_sieveProtocol::mimetype(const KURL & url)
/* --------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------- */
bool kio_sieveProtocol::sendData(const TQCString &data) bool tdeio_sieveProtocol::sendData(const TQCString &data)
{ {
TQCString write_buf = data + "\r\n"; TQCString write_buf = data + "\r\n";
@ -1206,7 +1206,7 @@ bool kio_sieveProtocol::sendData(const TQCString &data)
} }
/* --------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------- */
bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse) bool tdeio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
{ {
TQCString interpret; TQCString interpret;
int start, end; int start, end;
@ -1292,10 +1292,10 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
return true; return true;
} }
bool kio_sieveProtocol::operationSuccessful() bool tdeio_sieveProtocol::operationSuccessful()
{ {
while (receiveData(false)) { while (receiveData(false)) {
if (r.getType() == kio_sieveResponse::ACTION) { if (r.getType() == tdeio_sieveResponse::ACTION) {
TQCString response = r.getAction().left(2); TQCString response = r.getAction().left(2);
if (response == "OK") { if (response == "OK") {
return true; return true;
@ -1307,9 +1307,9 @@ bool kio_sieveProtocol::operationSuccessful()
return false; return false;
} }
int kio_sieveProtocol::operationResult() int tdeio_sieveProtocol::operationResult()
{ {
if (r.getType() == kio_sieveResponse::ACTION) { if (r.getType() == tdeio_sieveResponse::ACTION) {
TQCString response = r.getAction().left(2); TQCString response = r.getAction().left(2);
if (response == "OK") { if (response == "OK") {
return OK; return OK;
@ -1323,7 +1323,7 @@ int kio_sieveProtocol::operationResult()
return OTHER; return OTHER;
} }
bool kio_sieveProtocol::requestCapabilitiesAfterStartTLS() const bool tdeio_sieveProtocol::requestCapabilitiesAfterStartTLS() const
{ {
// Cyrus didn't send CAPABILITIES after STARTTLS until 2.3.11, which is // Cyrus didn't send CAPABILITIES after STARTTLS until 2.3.11, which is
// not standard conform, but we need to support that anyway. // not standard conform, but we need to support that anyway.

@ -27,7 +27,7 @@ class KDESasl;
class KURL; class KURL;
class kio_sieveResponse class tdeio_sieveResponse
{ {
public: public:
enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY }; enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY };
@ -58,7 +58,7 @@ protected:
TQCString extra; TQCString extra;
}; };
class kio_sieveProtocol : public TDEIO::TCPSlaveBase class tdeio_sieveProtocol : public TDEIO::TCPSlaveBase
{ {
public: public:

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_sieve exec=tdeio_sieve
protocol=sieve protocol=sieve
input=none input=none
output=filesystem output=filesystem

@ -30,9 +30,9 @@ install( FILES
DESTINATION ${SERVICES_INSTALL_DIR} ) DESTINATION ${SERVICES_INSTALL_DIR} )
##### kio_groupwise (module) #################### ##### tdeio_groupwise (module) ####################
tde_add_kpart( kio_groupwise AUTOMOC tde_add_kpart( tdeio_groupwise AUTOMOC
SOURCES groupwise.cpp SOURCES groupwise.cpp
LINK gwsoap-shared LINK gwsoap-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -8,12 +8,12 @@ METASOURCES = AUTO
kdelnkdir = $(kde_servicesdir) kdelnkdir = $(kde_servicesdir)
kdelnk_DATA = groupwise.protocol groupwises.protocol kdelnk_DATA = groupwise.protocol groupwises.protocol
kde_module_LTLIBRARIES = kio_groupwise.la kde_module_LTLIBRARIES = tdeio_groupwise.la
kio_groupwise_la_SOURCES = groupwise.cpp tdeio_groupwise_la_SOURCES = groupwise.cpp
kio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ tdeio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
../soap/libgwsoap.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) ../soap/libgwsoap.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
kio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeio_groupwise.pot $(XGETTEXT) *.cpp -o $(podir)/tdeio_groupwise.pot

@ -69,12 +69,12 @@ KDE_EXPORT int kdemain( int argc, char **argv );
int kdemain( int argc, char **argv ) int kdemain( int argc, char **argv )
{ {
TDEInstance instance( "kio_groupwise" ); TDEInstance instance( "tdeio_groupwise" );
kdDebug(7000) << "Starting kio_groupwise(pid: " << getpid() << ")" << endl; kdDebug(7000) << "Starting tdeio_groupwise(pid: " << getpid() << ")" << endl;
if (argc != 4) { if (argc != 4) {
fprintf( stderr, "Usage: kio_groupwise protocol domain-socket1 domain-socket2\n"); fprintf( stderr, "Usage: tdeio_groupwise protocol domain-socket1 domain-socket2\n");
exit( -1 ); exit( -1 );
} }

@ -1,6 +1,6 @@
[Protocol] [Protocol]
DocPath=tdeioslave/groupwise.html DocPath=tdeioslave/groupwise.html
exec=kio_groupwise exec=tdeio_groupwise
input=none input=none
output=filesystem output=filesystem
protocol=groupwise protocol=groupwise

@ -1,6 +1,6 @@
[Protocol] [Protocol]
DocPath=tdeioslave/groupwise.html DocPath=tdeioslave/groupwise.html
exec=kio_groupwise exec=tdeio_groupwise
input=none input=none
output=filesystem output=filesystem
protocol=groupwises protocol=groupwises

@ -28,9 +28,9 @@ install(
DESTINATION ${SERVICES_INSTALL_DIR} ) DESTINATION ${SERVICES_INSTALL_DIR} )
##### kio_scalix (module) ####################### ##### tdeio_scalix (module) #######################
tde_add_kpart( kio_scalix AUTOMOC tde_add_kpart( tdeio_scalix AUTOMOC
SOURCES scalix.cpp SOURCES scalix.cpp
LINK tdepim-shared LINK tdepim-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -7,11 +7,11 @@ METASOURCES = AUTO
kdelnkdir = $(kde_servicesdir) kdelnkdir = $(kde_servicesdir)
kdelnk_DATA = scalix.protocol scalixs.protocol kdelnk_DATA = scalix.protocol scalixs.protocol
kde_module_LTLIBRARIES = kio_scalix.la kde_module_LTLIBRARIES = tdeio_scalix.la
kio_scalix_la_SOURCES = scalix.cpp tdeio_scalix_la_SOURCES = scalix.cpp
kio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) tdeio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
kio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeio_scalix.pot $(XGETTEXT) *.cpp -o $(podir)/tdeio_scalix.pot

@ -51,7 +51,7 @@ int kdemain( int argc, char **argv )
putenv( strdup( "SESSION_MANAGER=" ) ); putenv( strdup( "SESSION_MANAGER=" ) );
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init( argc, argv, "kio_scalix", 0, 0, 0, 0 ); TDECmdLineArgs::init( argc, argv, "tdeio_scalix", 0, 0, 0, 0 );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
TDEApplication app( false, false ); TDEApplication app( false, false );

@ -1,6 +1,6 @@
[Protocol] [Protocol]
DocPath=tdeioslave/scalix.html DocPath=tdeioslave/scalix.html
exec=kio_scalix exec=tdeio_scalix
input=none input=none
output=filesystem output=filesystem
protocol=scalix protocol=scalix

@ -1,6 +1,6 @@
[Protocol] [Protocol]
DocPath=tdeioslave/scalix.html DocPath=tdeioslave/scalix.html
exec=kio_scalix exec=tdeio_scalix
input=none input=none
output=filesystem output=filesystem
protocol=scalixs protocol=scalixs

Loading…
Cancel
Save