diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ecb8ab7..065ddba0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,7 @@ endif( ) # WITH_ARTS affects kalarm # WITH_ARTS description without arts kalarm won't play sounds # with messages. -# WITH_SASL affects tdeioslaves(sieve imap4) +# WITH_SASL affects tdeioslave(sieve imap4) # WITH_SASL description sieve tdeioslave won't build without sasl and # imap4 tdeioslave will lose the ability of SASL # authentification @@ -138,7 +138,7 @@ option( BUILD_LIBKPGP "Build libkpgp" ${BUILD_ALL} ) option( BUILD_MIMELIB "Build mimelib" ${BUILD_ALL} ) option( BUILD_LIBKSIEVE "Build libksieve" ${BUILD_ALL} ) option( BUILD_LIBKPIMEXCHANGE "Build libkpimexchange" ${BUILD_ALL} ) -option( BUILD_TDEIOSLAVES "Build tdeioslaves" ${BUILD_ALL} ) +option( BUILD_TDEIOSLAVE "Build tdeioslave" ${BUILD_ALL} ) option( BUILD_KMAIL "Build kmail" ${BUILD_ALL} ) option( BUILD_AKREGATOR "Build akregator" ${BUILD_ALL} ) option( BUILD_KALARM "Build kalarm" ${BUILD_ALL} ) @@ -185,7 +185,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ##### activate dependencies ##################### -if( BUILD_LIBKCAL OR BUILD_LIBTDEPIM OR BUILD_LIBKPIMIDENTITIES OR BUILD_TDEIOSLAVES OR BUILD_KMAIL OR BUILD_KNODE ) +if( BUILD_LIBKCAL OR BUILD_LIBTDEPIM OR BUILD_LIBKPIMIDENTITIES OR BUILD_TDEIOSLAVE OR BUILD_KMAIL OR BUILD_KNODE ) add_subdirectory( libemailfunctions ) endif() @@ -209,7 +209,7 @@ tde_conditional_add_subdirectory( BUILD_LIBKPGP libkpgp ) tde_conditional_add_subdirectory( BUILD_MIMELIB mimelib ) tde_conditional_add_subdirectory( BUILD_LIBKSIEVE libksieve ) tde_conditional_add_subdirectory( BUILD_LIBKPIMEXCHANGE libkpimexchange ) -tde_conditional_add_subdirectory( BUILD_TDEIOSLAVES tdeioslaves ) +tde_conditional_add_subdirectory( BUILD_TDEIOSLAVE tdeioslave ) tde_conditional_add_subdirectory( BUILD_KMAIL kmail ) tde_conditional_add_subdirectory( BUILD_AKREGATOR akregator ) tde_conditional_add_subdirectory( BUILD_KALARM kalarm ) diff --git a/Makefile.am.in b/Makefile.am.in index 429c9ee7..929b518c 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -28,7 +28,7 @@ COMPILE_BEFORE_knode= libtdepim libkpgp libkmime COMPILE_BEFORE_karm = libtdepim tderesources COMPILE_BEFORE_plugins = kmail libtdepim libkcal COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm -COMPILE_BEFORE_tdeioslaves = libkmime libtdepim +COMPILE_BEFORE_tdeioslave = libkmime libtdepim COMPILE_BEFORE_libkpimexchange = libtdepim COMPILE_BEFORE_kalarm = libtdepim libkmime COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode diff --git a/config.h.cmake b/config.h.cmake index bc498ab1..eecbf497 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -29,7 +29,7 @@ #cmakedefine MAX_CMD_LENGTH @MAX_CMD_LENGTH@ #cmakedefine HAVE_C99_INITIALIZERS 1 -// tdeioslaves +// tdeioslave #cmakedefine HAVE_LIBSASL2 1 // kmail diff --git a/doc/tdeioslave/CMakeLists.txt b/doc/tdeioslave/CMakeLists.txt new file mode 100644 index 00000000..6bc5f187 --- /dev/null +++ b/doc/tdeioslave/CMakeLists.txt @@ -0,0 +1,9 @@ +################################################# +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_auto_add_subdirectories() diff --git a/doc/tdeioslave/Makefile.am b/doc/tdeioslave/Makefile.am new file mode 100644 index 00000000..561d25fa --- /dev/null +++ b/doc/tdeioslave/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = $(AUTODIRS) +KDE_LANG = en +KDE_DOCS = AUTO + diff --git a/doc/tdeioslave/mbox/CMakeLists.txt b/doc/tdeioslave/mbox/CMakeLists.txt new file mode 100644 index 00000000..b1aec04e --- /dev/null +++ b/doc/tdeioslave/mbox/CMakeLists.txt @@ -0,0 +1,9 @@ +################################################# +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION tdeioslave/mbox ) diff --git a/doc/tdeioslave/mbox/Makefile.am b/doc/tdeioslave/mbox/Makefile.am new file mode 100644 index 00000000..e96501e5 --- /dev/null +++ b/doc/tdeioslave/mbox/Makefile.am @@ -0,0 +1,2 @@ +KDE_LANG = en +KDE_DOCS = tdeioslave/mbox diff --git a/doc/tdeioslave/mbox/index.docbook b/doc/tdeioslave/mbox/index.docbook new file mode 100644 index 00000000..78784aea --- /dev/null +++ b/doc/tdeioslave/mbox/index.docbook @@ -0,0 +1,25 @@ + + + +]> + +
+mbox + + + + +BertjanBroeksema +&tde-authors; + + + + + +The mbox file format is an simple but rather inefficient way to store email +messages. All messages are appended after each other in the same file +separated by a special separator line. This gets especially expensive when +you have many emails in the same file. + +
diff --git a/doc/tdeioslave/sieve/CMakeLists.txt b/doc/tdeioslave/sieve/CMakeLists.txt new file mode 100644 index 00000000..22ff51a8 --- /dev/null +++ b/doc/tdeioslave/sieve/CMakeLists.txt @@ -0,0 +1,9 @@ +################################################# +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION tdeioslave/sieve ) diff --git a/doc/tdeioslave/sieve/Makefile.am b/doc/tdeioslave/sieve/Makefile.am new file mode 100644 index 00000000..b4c57786 --- /dev/null +++ b/doc/tdeioslave/sieve/Makefile.am @@ -0,0 +1,2 @@ +KDE_LANG = en +KDE_DOCS = tdeioslave/sieve diff --git a/doc/tdeioslave/sieve/index.docbook b/doc/tdeioslave/sieve/index.docbook new file mode 100644 index 00000000..4c99a532 --- /dev/null +++ b/doc/tdeioslave/sieve/index.docbook @@ -0,0 +1,27 @@ + + + +]> + +
+sieve + + + + +DanielBlack +&tde-authors; + + + + + +Sieve is a protocol that is used to manage filters for email. + +The filters are stored and run on the email server. + +IETF +RF5228 provides more information. + +
diff --git a/tdeioslaves/CMakeLists.txt b/tdeioslave/CMakeLists.txt similarity index 100% rename from tdeioslaves/CMakeLists.txt rename to tdeioslave/CMakeLists.txt diff --git a/tdeioslaves/ConfigureChecks.cmake b/tdeioslave/ConfigureChecks.cmake similarity index 100% rename from tdeioslaves/ConfigureChecks.cmake rename to tdeioslave/ConfigureChecks.cmake diff --git a/tdeioslaves/Mainpage.dox b/tdeioslave/Mainpage.dox similarity index 100% rename from tdeioslaves/Mainpage.dox rename to tdeioslave/Mainpage.dox diff --git a/tdeioslaves/Makefile.am b/tdeioslave/Makefile.am similarity index 71% rename from tdeioslaves/Makefile.am rename to tdeioslave/Makefile.am index 217a0c59..50975ea1 100644 --- a/tdeioslaves/Makefile.am +++ b/tdeioslave/Makefile.am @@ -6,6 +6,6 @@ endif SUBDIRS = imap4 mbox $(SIEVE_SUBDIR) -DOXYGEN_REFERENCES = tdeioslaves/imap4 tdeioslaves/mbox +DOXYGEN_REFERENCES = tdeioslave/imap4 tdeioslave/mbox include $(top_srcdir)/admin/Doxyfile.am diff --git a/tdeioslaves/configure.in.bot b/tdeioslave/configure.in.bot similarity index 100% rename from tdeioslaves/configure.in.bot rename to tdeioslave/configure.in.bot diff --git a/tdeioslaves/configure.in.in b/tdeioslave/configure.in.in similarity index 100% rename from tdeioslaves/configure.in.in rename to tdeioslave/configure.in.in diff --git a/tdeioslaves/imap4/CMakeLists.txt b/tdeioslave/imap4/CMakeLists.txt similarity index 100% rename from tdeioslaves/imap4/CMakeLists.txt rename to tdeioslave/imap4/CMakeLists.txt diff --git a/tdeioslaves/imap4/Makefile.am b/tdeioslave/imap4/Makefile.am similarity index 100% rename from tdeioslaves/imap4/Makefile.am rename to tdeioslave/imap4/Makefile.am diff --git a/tdeioslaves/imap4/PATCHING b/tdeioslave/imap4/PATCHING similarity index 100% rename from tdeioslaves/imap4/PATCHING rename to tdeioslave/imap4/PATCHING diff --git a/tdeioslaves/imap4/README b/tdeioslave/imap4/README similarity index 100% rename from tdeioslaves/imap4/README rename to tdeioslave/imap4/README diff --git a/tdeioslaves/imap4/configure.in.in b/tdeioslave/imap4/configure.in.in similarity index 100% rename from tdeioslaves/imap4/configure.in.in rename to tdeioslave/imap4/configure.in.in diff --git a/tdeioslaves/imap4/imap4.cc b/tdeioslave/imap4/imap4.cc similarity index 100% rename from tdeioslaves/imap4/imap4.cc rename to tdeioslave/imap4/imap4.cc diff --git a/tdeioslaves/imap4/imap4.h b/tdeioslave/imap4/imap4.h similarity index 100% rename from tdeioslaves/imap4/imap4.h rename to tdeioslave/imap4/imap4.h diff --git a/tdeioslaves/imap4/imap4.protocol b/tdeioslave/imap4/imap4.protocol similarity index 100% rename from tdeioslaves/imap4/imap4.protocol rename to tdeioslave/imap4/imap4.protocol diff --git a/tdeioslaves/imap4/imapcommand.cc b/tdeioslave/imap4/imapcommand.cc similarity index 100% rename from tdeioslaves/imap4/imapcommand.cc rename to tdeioslave/imap4/imapcommand.cc diff --git a/tdeioslaves/imap4/imapcommand.h b/tdeioslave/imap4/imapcommand.h similarity index 100% rename from tdeioslaves/imap4/imapcommand.h rename to tdeioslave/imap4/imapcommand.h diff --git a/tdeioslaves/imap4/imapinfo.cc b/tdeioslave/imap4/imapinfo.cc similarity index 100% rename from tdeioslaves/imap4/imapinfo.cc rename to tdeioslave/imap4/imapinfo.cc diff --git a/tdeioslaves/imap4/imapinfo.h b/tdeioslave/imap4/imapinfo.h similarity index 100% rename from tdeioslaves/imap4/imapinfo.h rename to tdeioslave/imap4/imapinfo.h diff --git a/tdeioslaves/imap4/imaplist.cc b/tdeioslave/imap4/imaplist.cc similarity index 100% rename from tdeioslaves/imap4/imaplist.cc rename to tdeioslave/imap4/imaplist.cc diff --git a/tdeioslaves/imap4/imaplist.h b/tdeioslave/imap4/imaplist.h similarity index 100% rename from tdeioslaves/imap4/imaplist.h rename to tdeioslave/imap4/imaplist.h diff --git a/tdeioslaves/imap4/imapparser.cc b/tdeioslave/imap4/imapparser.cc similarity index 100% rename from tdeioslaves/imap4/imapparser.cc rename to tdeioslave/imap4/imapparser.cc diff --git a/tdeioslaves/imap4/imapparser.h b/tdeioslave/imap4/imapparser.h similarity index 100% rename from tdeioslaves/imap4/imapparser.h rename to tdeioslave/imap4/imapparser.h diff --git a/tdeioslaves/imap4/imaps.protocol b/tdeioslave/imap4/imaps.protocol similarity index 94% rename from tdeioslaves/imap4/imaps.protocol rename to tdeioslave/imap4/imaps.protocol index b6c07040..64a3aaf9 100644 --- a/tdeioslaves/imap4/imaps.protocol +++ b/tdeioslave/imap4/imaps.protocol @@ -27,4 +27,4 @@ source=true Capabilities=Subscription,ACL,Quota Icon=folder_inbox -DocPath=tdeioslave/imaps/index.html +DocPath=tdeioslave/imap/index.html diff --git a/tdeioslaves/imap4/mailaddress.cc b/tdeioslave/imap4/mailaddress.cc similarity index 100% rename from tdeioslaves/imap4/mailaddress.cc rename to tdeioslave/imap4/mailaddress.cc diff --git a/tdeioslaves/imap4/mailaddress.h b/tdeioslave/imap4/mailaddress.h similarity index 100% rename from tdeioslaves/imap4/mailaddress.h rename to tdeioslave/imap4/mailaddress.h diff --git a/tdeioslaves/imap4/mailheader.cc b/tdeioslave/imap4/mailheader.cc similarity index 100% rename from tdeioslaves/imap4/mailheader.cc rename to tdeioslave/imap4/mailheader.cc diff --git a/tdeioslaves/imap4/mailheader.h b/tdeioslave/imap4/mailheader.h similarity index 100% rename from tdeioslaves/imap4/mailheader.h rename to tdeioslave/imap4/mailheader.h diff --git a/tdeioslaves/imap4/mimehdrline.cc b/tdeioslave/imap4/mimehdrline.cc similarity index 100% rename from tdeioslaves/imap4/mimehdrline.cc rename to tdeioslave/imap4/mimehdrline.cc diff --git a/tdeioslaves/imap4/mimehdrline.h b/tdeioslave/imap4/mimehdrline.h similarity index 100% rename from tdeioslaves/imap4/mimehdrline.h rename to tdeioslave/imap4/mimehdrline.h diff --git a/tdeioslaves/imap4/mimeheader.cc b/tdeioslave/imap4/mimeheader.cc similarity index 100% rename from tdeioslaves/imap4/mimeheader.cc rename to tdeioslave/imap4/mimeheader.cc diff --git a/tdeioslaves/imap4/mimeheader.h b/tdeioslave/imap4/mimeheader.h similarity index 100% rename from tdeioslaves/imap4/mimeheader.h rename to tdeioslave/imap4/mimeheader.h diff --git a/tdeioslaves/imap4/mimeio.cc b/tdeioslave/imap4/mimeio.cc similarity index 100% rename from tdeioslaves/imap4/mimeio.cc rename to tdeioslave/imap4/mimeio.cc diff --git a/tdeioslaves/imap4/mimeio.h b/tdeioslave/imap4/mimeio.h similarity index 100% rename from tdeioslaves/imap4/mimeio.h rename to tdeioslave/imap4/mimeio.h diff --git a/tdeioslaves/imap4/rfcdecoder.cc b/tdeioslave/imap4/rfcdecoder.cc similarity index 100% rename from tdeioslaves/imap4/rfcdecoder.cc rename to tdeioslave/imap4/rfcdecoder.cc diff --git a/tdeioslaves/imap4/rfcdecoder.h b/tdeioslave/imap4/rfcdecoder.h similarity index 100% rename from tdeioslaves/imap4/rfcdecoder.h rename to tdeioslave/imap4/rfcdecoder.h diff --git a/tdeioslaves/imap4/selectinfo.h b/tdeioslave/imap4/selectinfo.h similarity index 100% rename from tdeioslaves/imap4/selectinfo.h rename to tdeioslave/imap4/selectinfo.h diff --git a/tdeioslaves/mbox/AUTHORS b/tdeioslave/mbox/AUTHORS similarity index 100% rename from tdeioslaves/mbox/AUTHORS rename to tdeioslave/mbox/AUTHORS diff --git a/tdeioslaves/mbox/CMakeLists.txt b/tdeioslave/mbox/CMakeLists.txt similarity index 100% rename from tdeioslaves/mbox/CMakeLists.txt rename to tdeioslave/mbox/CMakeLists.txt diff --git a/tdeioslaves/mbox/Makefile.am b/tdeioslave/mbox/Makefile.am similarity index 100% rename from tdeioslaves/mbox/Makefile.am rename to tdeioslave/mbox/Makefile.am diff --git a/tdeioslaves/mbox/README b/tdeioslave/mbox/README similarity index 100% rename from tdeioslaves/mbox/README rename to tdeioslave/mbox/README diff --git a/tdeioslaves/mbox/mbox.cc b/tdeioslave/mbox/mbox.cc similarity index 100% rename from tdeioslaves/mbox/mbox.cc rename to tdeioslave/mbox/mbox.cc diff --git a/tdeioslaves/mbox/mbox.h b/tdeioslave/mbox/mbox.h similarity index 100% rename from tdeioslaves/mbox/mbox.h rename to tdeioslave/mbox/mbox.h diff --git a/tdeioslaves/mbox/mbox.protocol b/tdeioslave/mbox/mbox.protocol similarity index 100% rename from tdeioslaves/mbox/mbox.protocol rename to tdeioslave/mbox/mbox.protocol diff --git a/tdeioslaves/mbox/mboxfile.cc b/tdeioslave/mbox/mboxfile.cc similarity index 100% rename from tdeioslaves/mbox/mboxfile.cc rename to tdeioslave/mbox/mboxfile.cc diff --git a/tdeioslaves/mbox/mboxfile.h b/tdeioslave/mbox/mboxfile.h similarity index 100% rename from tdeioslaves/mbox/mboxfile.h rename to tdeioslave/mbox/mboxfile.h diff --git a/tdeioslaves/mbox/readmbox.cc b/tdeioslave/mbox/readmbox.cc similarity index 100% rename from tdeioslaves/mbox/readmbox.cc rename to tdeioslave/mbox/readmbox.cc diff --git a/tdeioslaves/mbox/readmbox.h b/tdeioslave/mbox/readmbox.h similarity index 100% rename from tdeioslaves/mbox/readmbox.h rename to tdeioslave/mbox/readmbox.h diff --git a/tdeioslaves/mbox/stat.cc b/tdeioslave/mbox/stat.cc similarity index 100% rename from tdeioslaves/mbox/stat.cc rename to tdeioslave/mbox/stat.cc diff --git a/tdeioslaves/mbox/stat.h b/tdeioslave/mbox/stat.h similarity index 100% rename from tdeioslaves/mbox/stat.h rename to tdeioslave/mbox/stat.h diff --git a/tdeioslaves/mbox/urlinfo.cc b/tdeioslave/mbox/urlinfo.cc similarity index 100% rename from tdeioslaves/mbox/urlinfo.cc rename to tdeioslave/mbox/urlinfo.cc diff --git a/tdeioslaves/mbox/urlinfo.h b/tdeioslave/mbox/urlinfo.h similarity index 100% rename from tdeioslaves/mbox/urlinfo.h rename to tdeioslave/mbox/urlinfo.h diff --git a/tdeioslaves/opengroupware/Makefile.am b/tdeioslave/opengroupware/Makefile.am similarity index 100% rename from tdeioslaves/opengroupware/Makefile.am rename to tdeioslave/opengroupware/Makefile.am diff --git a/tdeioslaves/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp similarity index 100% rename from tdeioslaves/opengroupware/opengroupware.cpp rename to tdeioslave/opengroupware/opengroupware.cpp diff --git a/tdeioslaves/opengroupware/opengroupware.h b/tdeioslave/opengroupware/opengroupware.h similarity index 100% rename from tdeioslaves/opengroupware/opengroupware.h rename to tdeioslave/opengroupware/opengroupware.h diff --git a/tdeioslaves/opengroupware/opengroupware.protocol b/tdeioslave/opengroupware/opengroupware.protocol similarity index 100% rename from tdeioslaves/opengroupware/opengroupware.protocol rename to tdeioslave/opengroupware/opengroupware.protocol diff --git a/tdeioslaves/opengroupware/opengroupwares.protocol b/tdeioslave/opengroupware/opengroupwares.protocol similarity index 100% rename from tdeioslaves/opengroupware/opengroupwares.protocol rename to tdeioslave/opengroupware/opengroupwares.protocol diff --git a/tdeioslaves/opengroupware/webdavhandler.cpp b/tdeioslave/opengroupware/webdavhandler.cpp similarity index 100% rename from tdeioslaves/opengroupware/webdavhandler.cpp rename to tdeioslave/opengroupware/webdavhandler.cpp diff --git a/tdeioslaves/opengroupware/webdavhandler.h b/tdeioslave/opengroupware/webdavhandler.h similarity index 100% rename from tdeioslaves/opengroupware/webdavhandler.h rename to tdeioslave/opengroupware/webdavhandler.h diff --git a/tdeioslaves/sieve/CMakeLists.txt b/tdeioslave/sieve/CMakeLists.txt similarity index 100% rename from tdeioslaves/sieve/CMakeLists.txt rename to tdeioslave/sieve/CMakeLists.txt diff --git a/tdeioslaves/sieve/Makefile.am b/tdeioslave/sieve/Makefile.am similarity index 100% rename from tdeioslaves/sieve/Makefile.am rename to tdeioslave/sieve/Makefile.am diff --git a/tdeioslaves/sieve/configure.in.in b/tdeioslave/sieve/configure.in.in similarity index 100% rename from tdeioslaves/sieve/configure.in.in rename to tdeioslave/sieve/configure.in.in diff --git a/tdeioslaves/sieve/draft-daboo-sieve-include.txt b/tdeioslave/sieve/draft-daboo-sieve-include.txt similarity index 100% rename from tdeioslaves/sieve/draft-daboo-sieve-include.txt rename to tdeioslave/sieve/draft-daboo-sieve-include.txt diff --git a/tdeioslaves/sieve/draft-daboo-sieve-spamtest.txt b/tdeioslave/sieve/draft-daboo-sieve-spamtest.txt similarity index 100% rename from tdeioslaves/sieve/draft-daboo-sieve-spamtest.txt rename to tdeioslave/sieve/draft-daboo-sieve-spamtest.txt diff --git a/tdeioslaves/sieve/draft-degener-sieve-body-00.txt b/tdeioslave/sieve/draft-degener-sieve-body-00.txt similarity index 100% rename from tdeioslaves/sieve/draft-degener-sieve-body-00.txt rename to tdeioslave/sieve/draft-degener-sieve-body-00.txt diff --git a/tdeioslaves/sieve/draft-degener-sieve-copy.txt b/tdeioslave/sieve/draft-degener-sieve-copy.txt similarity index 100% rename from tdeioslaves/sieve/draft-degener-sieve-copy.txt rename to tdeioslave/sieve/draft-degener-sieve-copy.txt diff --git a/tdeioslaves/sieve/draft-degener-sieve-editheader.txt b/tdeioslave/sieve/draft-degener-sieve-editheader.txt similarity index 100% rename from tdeioslaves/sieve/draft-degener-sieve-editheader.txt rename to tdeioslave/sieve/draft-degener-sieve-editheader.txt diff --git a/tdeioslaves/sieve/draft-degener-sieve-multiscript.txt b/tdeioslave/sieve/draft-degener-sieve-multiscript.txt similarity index 100% rename from tdeioslaves/sieve/draft-degener-sieve-multiscript.txt rename to tdeioslave/sieve/draft-degener-sieve-multiscript.txt diff --git a/tdeioslaves/sieve/draft-homme-sieve-variables.txt b/tdeioslave/sieve/draft-homme-sieve-variables.txt similarity index 100% rename from tdeioslaves/sieve/draft-homme-sieve-variables.txt rename to tdeioslave/sieve/draft-homme-sieve-variables.txt diff --git a/tdeioslaves/sieve/draft-martin-managesieve-04.txt b/tdeioslave/sieve/draft-martin-managesieve-04.txt similarity index 100% rename from tdeioslaves/sieve/draft-martin-managesieve-04.txt rename to tdeioslave/sieve/draft-martin-managesieve-04.txt diff --git a/tdeioslaves/sieve/draft-martin-sieve-notify-01.txt b/tdeioslave/sieve/draft-martin-sieve-notify-01.txt similarity index 100% rename from tdeioslaves/sieve/draft-martin-sieve-notify-01.txt rename to tdeioslave/sieve/draft-martin-sieve-notify-01.txt diff --git a/tdeioslaves/sieve/draft-melnikov-sieve-imapflags.txt b/tdeioslave/sieve/draft-melnikov-sieve-imapflags.txt similarity index 100% rename from tdeioslaves/sieve/draft-melnikov-sieve-imapflags.txt rename to tdeioslave/sieve/draft-melnikov-sieve-imapflags.txt diff --git a/tdeioslaves/sieve/draft-murchison-sieve-regex-06.txt b/tdeioslave/sieve/draft-murchison-sieve-regex-06.txt similarity index 100% rename from tdeioslaves/sieve/draft-murchison-sieve-regex-06.txt rename to tdeioslave/sieve/draft-murchison-sieve-regex-06.txt diff --git a/tdeioslaves/sieve/draft-murchison-sieve-subaddress-05.txt b/tdeioslave/sieve/draft-murchison-sieve-subaddress-05.txt similarity index 100% rename from tdeioslaves/sieve/draft-murchison-sieve-subaddress-05.txt rename to tdeioslave/sieve/draft-murchison-sieve-subaddress-05.txt diff --git a/tdeioslaves/sieve/draft-showalter-sieve-vacation-04.txt b/tdeioslave/sieve/draft-showalter-sieve-vacation-04.txt similarity index 100% rename from tdeioslaves/sieve/draft-showalter-sieve-vacation-04.txt rename to tdeioslave/sieve/draft-showalter-sieve-vacation-04.txt diff --git a/tdeioslaves/sieve/rfc3028.txt b/tdeioslave/sieve/rfc3028.txt similarity index 100% rename from tdeioslaves/sieve/rfc3028.txt rename to tdeioslave/sieve/rfc3028.txt diff --git a/tdeioslaves/sieve/rfc3431.txt b/tdeioslave/sieve/rfc3431.txt similarity index 100% rename from tdeioslaves/sieve/rfc3431.txt rename to tdeioslave/sieve/rfc3431.txt diff --git a/tdeioslaves/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp similarity index 100% rename from tdeioslaves/sieve/sieve.cpp rename to tdeioslave/sieve/sieve.cpp diff --git a/tdeioslaves/sieve/sieve.h b/tdeioslave/sieve/sieve.h similarity index 100% rename from tdeioslaves/sieve/sieve.h rename to tdeioslave/sieve/sieve.h diff --git a/tdeioslaves/sieve/sieve.protocol b/tdeioslave/sieve/sieve.protocol similarity index 100% rename from tdeioslaves/sieve/sieve.protocol rename to tdeioslave/sieve/sieve.protocol