From c051208b6030f06b5e9421ece25574e4bea52b4c Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Wed, 4 Feb 2009 19:59:56 +0100
Subject: [PATCH] Imap4flags: properly named extension directory and source
files.
---
configure.in | 2 +-
src/lib-sieve/Makefile.am | 2 +-
src/lib-sieve/plugins/Makefile.am | 2 +-
.../plugins/{imapflags => imap4flags}/Makefile.am | 10 +++++-----
.../plugins/{imapflags => imap4flags}/cmd-flag.c | 2 +-
.../ext-imap4flags-common.c} | 2 +-
.../ext-imap4flags-common.h} | 4 ++--
.../ext-imapflags.c => imap4flags/ext-imap4flags.c} | 2 +-
.../plugins/{imapflags => imap4flags}/tag-flags.c | 2 +-
.../plugins/{imapflags => imap4flags}/tst-hasflag.c | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
rename src/lib-sieve/plugins/{imapflags => imap4flags}/Makefile.am (66%)
rename src/lib-sieve/plugins/{imapflags => imap4flags}/cmd-flag.c (99%)
rename src/lib-sieve/plugins/{imapflags/ext-imapflags-common.c => imap4flags/ext-imap4flags-common.c} (99%)
rename src/lib-sieve/plugins/{imapflags/ext-imapflags-common.h => imap4flags/ext-imap4flags-common.h} (97%)
rename src/lib-sieve/plugins/{imapflags/ext-imapflags.c => imap4flags/ext-imap4flags.c} (98%)
rename src/lib-sieve/plugins/{imapflags => imap4flags}/tag-flags.c (99%)
rename src/lib-sieve/plugins/{imapflags => imap4flags}/tst-hasflag.c (99%)
diff --git a/configure.in b/configure.in
index f223589fa..c585b432c 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 f15b97c8f..68ea38da9 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 e6e065cfa..d5786fe76 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 0ac8bb48b..e3af73faf 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 8722134f3..52e76ba1b 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 485f784f3..afe0d843c 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 8812dfc61..abbe35c04 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 7903b28ad..23dc75677 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 22218fe44..b08708d64 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 82dda8abc..62a562b26 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
--
GitLab