diff --git a/configure.in b/configure.in index f223589fa45fcdba02d33db0a12ed421fd3bfbfe..c585b432c3accdfad640d9c122c0012655025525 100644 --- a/configure.in +++ b/configure.in @@ -107,7 +107,7 @@ src/lib-sieve/plugins/subaddress/Makefile src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile src/lib-sieve/plugins/relational/Makefile src/lib-sieve/plugins/regex/Makefile -src/lib-sieve/plugins/imapflags/Makefile +src/lib-sieve/plugins/imap4flags/Makefile src/lib-sieve/plugins/copy/Makefile src/lib-sieve/plugins/include/Makefile src/lib-sieve/plugins/body/Makefile diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am index f15b97c8f67b8d108d3bb56e8ad67f48d0b5a45b..68ea38da90dd274c76f7447fc71d34f42aabe10d 100644 --- a/src/lib-sieve/Makefile.am +++ b/src/lib-sieve/Makefile.am @@ -50,7 +50,7 @@ plugins = \ ./plugins/relational/libsieve_ext_relational.la \ ./plugins/regex/libsieve_ext_regex.la \ ./plugins/copy/libsieve_ext_copy.la \ - ./plugins/imapflags/libsieve_ext_imapflags.la \ + ./plugins/imap4flags/libsieve_ext_imap4flags.la \ ./plugins/include/libsieve_ext_include.la \ ./plugins/body/libsieve_ext_body.la \ ./plugins/variables/libsieve_ext_variables.la \ diff --git a/src/lib-sieve/plugins/Makefile.am b/src/lib-sieve/plugins/Makefile.am index e6e065cfaceef27dfaffb1dc5c6202d9570e26fd..d5786fe76575686550750aaf62089774300e5d2c 100644 --- a/src/lib-sieve/plugins/Makefile.am +++ b/src/lib-sieve/plugins/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = \ comparator-i-ascii-numeric \ relational \ regex \ - imapflags \ + imap4flags \ copy \ include \ body \ diff --git a/src/lib-sieve/plugins/imapflags/Makefile.am b/src/lib-sieve/plugins/imap4flags/Makefile.am similarity index 66% rename from src/lib-sieve/plugins/imapflags/Makefile.am rename to src/lib-sieve/plugins/imap4flags/Makefile.am index 0ac8bb48b6db5f490878459324107b57cdc32ade..e3af73faf7ec05c4e35af576dc602dc4fcbbea4e 100644 --- a/src/lib-sieve/plugins/imapflags/Makefile.am +++ b/src/lib-sieve/plugins/imap4flags/Makefile.am @@ -1,4 +1,4 @@ -noinst_LTLIBRARIES = libsieve_ext_imapflags.la +noinst_LTLIBRARIES = libsieve_ext_imap4flags.la AM_CPPFLAGS = \ -I../../ \ @@ -17,12 +17,12 @@ tests = \ tags = \ tag-flags.c -libsieve_ext_imapflags_la_SOURCES = \ - ext-imapflags-common.c \ +libsieve_ext_imap4flags_la_SOURCES = \ + ext-imap4flags-common.c \ $(commands) \ $(tests) \ $(tags) \ - ext-imapflags.c + ext-imap4flags.c noinst_HEADERS = \ - ext-imapflags-common.h + ext-imap4flags-common.h diff --git a/src/lib-sieve/plugins/imapflags/cmd-flag.c b/src/lib-sieve/plugins/imap4flags/cmd-flag.c similarity index 99% rename from src/lib-sieve/plugins/imapflags/cmd-flag.c rename to src/lib-sieve/plugins/imap4flags/cmd-flag.c index 8722134f39ac15a7d8b91df9395868edf18291fd..52e76ba1b763485bfa797d23bbde166c5f9b4a6a 100644 --- a/src/lib-sieve/plugins/imapflags/cmd-flag.c +++ b/src/lib-sieve/plugins/imap4flags/cmd-flag.c @@ -10,7 +10,7 @@ #include "sieve-interpreter.h" #include "sieve-dump.h" -#include "ext-imapflags-common.h" +#include "ext-imap4flags-common.h" /* * Commands diff --git a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c similarity index 99% rename from src/lib-sieve/plugins/imapflags/ext-imapflags-common.c rename to src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c index 485f784f343d2cbd87818d9b04ab808012fe5087..afe0d843c3542d8cb10bc09035b7a65086442a10 100644 --- a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c +++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c @@ -17,7 +17,7 @@ #include "sieve-ext-variables.h" -#include "ext-imapflags-common.h" +#include "ext-imap4flags-common.h" /* * Forward declarations diff --git a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.h b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h similarity index 97% rename from src/lib-sieve/plugins/imapflags/ext-imapflags-common.h rename to src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h index 8812dfc6166aa014bf42bc03ad0e00e3cfff868a..abbe35c049228da9cd224828c376a2e29ece9163 100644 --- a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.h +++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h @@ -1,8 +1,8 @@ /* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file */ -#ifndef __EXT_IMAPFLAGS_COMMON_H -#define __EXT_IMAPFLAGS_COMMON_H +#ifndef __EXT_IMAP4FLAGS_COMMON_H +#define __EXT_IMAP4FLAGS_COMMON_H #include "lib.h" diff --git a/src/lib-sieve/plugins/imapflags/ext-imapflags.c b/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c similarity index 98% rename from src/lib-sieve/plugins/imapflags/ext-imapflags.c rename to src/lib-sieve/plugins/imap4flags/ext-imap4flags.c index 7903b28ad0ea0ffdf0df2edd9392380ecead4a92..23dc756771dc1161828678de0ef92b4d33dd0f73 100644 --- a/src/lib-sieve/plugins/imapflags/ext-imapflags.c +++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c @@ -25,7 +25,7 @@ #include "sieve-generator.h" #include "sieve-interpreter.h" -#include "ext-imapflags-common.h" +#include "ext-imap4flags-common.h" /* * Operations diff --git a/src/lib-sieve/plugins/imapflags/tag-flags.c b/src/lib-sieve/plugins/imap4flags/tag-flags.c similarity index 99% rename from src/lib-sieve/plugins/imapflags/tag-flags.c rename to src/lib-sieve/plugins/imap4flags/tag-flags.c index 22218fe441520ab1dcd653f8bc5972c13c19caad..b08708d64f26fa613a632cc505160fa698c65330 100644 --- a/src/lib-sieve/plugins/imapflags/tag-flags.c +++ b/src/lib-sieve/plugins/imap4flags/tag-flags.c @@ -16,7 +16,7 @@ #include "sieve-actions.h" #include "sieve-dump.h" -#include "ext-imapflags-common.h" +#include "ext-imap4flags-common.h" #include <ctype.h> diff --git a/src/lib-sieve/plugins/imapflags/tst-hasflag.c b/src/lib-sieve/plugins/imap4flags/tst-hasflag.c similarity index 99% rename from src/lib-sieve/plugins/imapflags/tst-hasflag.c rename to src/lib-sieve/plugins/imap4flags/tst-hasflag.c index 82dda8abc05d02f357fb0b7c0928572ec23a8ee7..62a562b26b7638601f4a55fc33fed76ae41b5d1c 100644 --- a/src/lib-sieve/plugins/imapflags/tst-hasflag.c +++ b/src/lib-sieve/plugins/imap4flags/tst-hasflag.c @@ -13,7 +13,7 @@ #include "sieve-dump.h" #include "sieve-match.h" -#include "ext-imapflags-common.h" +#include "ext-imap4flags-common.h" /* * Hasflag test