diff options
| -rw-r--r-- | shell/ChangeLog | 9 | ||||
| -rw-r--r-- | shell/e-config-upgrade.c | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index d4f8e00991..b850372e89 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,12 @@ +2003-04-02 Not Zed <NotZed@Ximian.com> + + [#40590] + + * e-config-upgrade.c (identity_map[]): Move the signature stuff to + a child node. + (identity_sig_map[]): Define the signature node. Fix + *autogenerated_signature_%i to map to "auto". + 2003-04-01 Not Zed <NotZed@Ximian.com> [#40474] diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 2cbcad315b..a3f8e32573 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -642,13 +642,18 @@ struct _map_table smime_map[] = { { NULL }, }; +struct _map_table identity_sig_map[] = { + { "identity_autogenerated_signature_%i", "auto", MAP_BOOL }, + { "identity_def_signature_%i", "default", MAP_LONG }, + { NULL }, +}; + struct _map_table identity_map[] = { { "identity_name_%i", "name", MAP_STRING|MAP_CONTENT }, { "identity_address_%i", "addr-spec", MAP_STRING|MAP_CONTENT }, { "identity_reply_to_%i", "reply-to", MAP_STRING|MAP_CONTENT }, { "identity_organization_%i", "organization", MAP_STRING|MAP_CONTENT }, - { "identity_autogenerated_signature_%i", "signature", MAP_BOOL }, - { "identity_def_signature_%i", "default", MAP_LONG }, + { NULL, "signature", MAP_CHILD, identity_sig_map }, { NULL }, }; |