From 31e408150a8b8fb35007e7d00b32361e0cb0f4e3 Mon Sep 17 00:00:00 2001 From: Stephan Bosch <stephan@rename-it.nl> Date: Thu, 31 Dec 2009 04:40:09 +0100 Subject: [PATCH] Enotify extension: adjusted notify method registration API. --- src/lib-sieve/plugins/enotify/ext-enotify-common.c | 13 +++++++++---- src/lib-sieve/plugins/enotify/sieve-ext-enotify.h | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lib-sieve/plugins/enotify/ext-enotify-common.c b/src/lib-sieve/plugins/enotify/ext-enotify-common.c index 9d9bcae9e..7e35e38d1 100644 --- a/src/lib-sieve/plugins/enotify/ext-enotify-common.c +++ b/src/lib-sieve/plugins/enotify/ext-enotify-common.c @@ -74,12 +74,17 @@ void ext_enotify_methods_deinit(struct ext_enotify_context *ectx) } void sieve_enotify_method_register -(struct sieve_extension *ntfy_ext, const struct sieve_enotify_method *method) +(struct sieve_instance *svinst, const struct sieve_enotify_method *method) { - struct ext_enotify_context *ectx = - (struct ext_enotify_context *) ntfy_ext->context; + const struct sieve_extension *ntfy_ext = + sieve_extension_get_by_name(svinst, "enotify"); - ext_enotify_method_register(ectx, method); + if ( ntfy_ext != NULL ) { + struct ext_enotify_context *ectx = + (struct ext_enotify_context *) ntfy_ext->context; + + ext_enotify_method_register(ectx, method); + } } const struct sieve_enotify_method *ext_enotify_method_find diff --git a/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h b/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h index 44d2a3988..a70c422db 100644 --- a/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h +++ b/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h @@ -87,7 +87,7 @@ struct sieve_enotify_method { }; void sieve_enotify_method_register -(struct sieve_extension *ntfy_ext, const struct sieve_enotify_method *method); +(struct sieve_instance *svinst, const struct sieve_enotify_method *method); /* * Notify method printing -- GitLab