diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-11 00:12:41 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-11 00:12:41 +0200 |
| commit | dfe6343d9522cea2e6653abc267b42040925b3e6 (patch) | |
| tree | 85fe0c174281c36a241ca44f828e81148e794b08 /src/wydawca.h | |
| parent | 39a97e438dde837ada9a99cceea93a1cf97db19e (diff) | |
| download | wydawca-dfe6343d9522cea2e6653abc267b42040925b3e6.tar.gz wydawca-dfe6343d9522cea2e6653abc267b42040925b3e6.tar.bz2 | |
Put back admin and owner address expansions.
* src/meta.c (metadef_join): New function.
* src/triplet.c (triplet_expand_param): Extra argument supplies
an additional metadef to use together with triplet_meta.
* src/wydawca.h (triplet_expand_param): Change signature.
* modules/mailutils/mod_mailutils.c (t_notify): Provide
extra metadef for admin and owner addresses.
Diffstat (limited to 'src/wydawca.h')
| -rw-r--r-- | src/wydawca.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wydawca.h b/src/wydawca.h index ea5705f..685bf3a 100644 --- a/src/wydawca.h +++ b/src/wydawca.h @@ -313,6 +313,7 @@ struct metadef { char *meta_expand_string(const char *string, struct metadef *def, void *data, struct dictionary *dict, void *handle); void meta_free(struct metadef *def); +struct metadef *metadef_join(struct metadef *a, struct metadef *b); const char *expand_email_admin(struct metadef *def, void *data); const char *expand_email_owner(struct metadef *def, void *data); @@ -458,7 +459,8 @@ void spool_commit_triplets(struct spool *, struct file_triplet *); struct file_triplet *link_processable_triplets(void); size_t count_collected_triplets(void); -char *triplet_expand_param(const char *tmpl, struct file_triplet const *trp); +char *triplet_expand_param(const char *tmpl, struct file_triplet const *trp, + struct metadef *xmeta); char *triplet_expand_dictionary_query(struct dictionary *dict, void *handle, struct file_triplet const *trp); |