aboutsummaryrefslogtreecommitdiffstats
path: root/mail/importers
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2004-04-02 03:47:06 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-04-02 03:47:06 +0800
commit433683fae007ac7effc4418991cbadaf022d205a (patch)
treeda1c72877eb0e6ad73112a4763f8cc545bb57f49 /mail/importers
parent823c4492c54d09fab675b1c15966ef981a58ca9e (diff)
downloadgsoc2013-evolution-433683fae007ac7effc4418991cbadaf022d205a.tar
gsoc2013-evolution-433683fae007ac7effc4418991cbadaf022d205a.tar.gz
gsoc2013-evolution-433683fae007ac7effc4418991cbadaf022d205a.tar.bz2
gsoc2013-evolution-433683fae007ac7effc4418991cbadaf022d205a.tar.lz
gsoc2013-evolution-433683fae007ac7effc4418991cbadaf022d205a.tar.xz
gsoc2013-evolution-433683fae007ac7effc4418991cbadaf022d205a.tar.zst
gsoc2013-evolution-433683fae007ac7effc4418991cbadaf022d205a.zip
Updated for signature API changes.
2004-04-01 Jeffrey Stedfast <fejj@ximian.com> * importers/netscape-importer.c (netscape_import_accounts): Updated for signature API changes. * mail-account-gui.c: Same. * mail-signature-editor.c: Same. * em-composer-prefs.c: Same. * mail-config.c: Rewrote the signature stuff to use ESignatureList instead. Much cleaner and less broken. * em-mailer-prefs.c (em_mailer_prefs_construct): Always make the Add/Remove Header buttons de-sensitised at the start. Fixes bug #56284. svn path=/trunk/; revision=25282
Diffstat (limited to 'mail/importers')
-rw-r--r--mail/importers/netscape-importer.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c
index 1e60e7f3c5..7b72c28d24 100644
--- a/mail/importers/netscape-importer.c
+++ b/mail/importers/netscape-importer.c
@@ -57,6 +57,7 @@
#include <filter/filter-int.h>
#include "e-util/e-account-list.h"
+#include "e-util/e-signature-list.h"
#include "mail/mail-mt.h"
#include "mail/mail-config.h"
@@ -1482,13 +1483,13 @@ netscape_import_accounts (NsImporter *importer)
nstr = netscape_get_string ("mail.signature_file");
if (nstr != NULL) {
- MailConfigSignature *sig;
+ ESignature *sig;
char *cmd;
-
- sig = mail_config_signature_new(FALSE, NULL);
- mail_config_signature_add(sig);
- account->id->def_signature = sig->id;
- account->id->auto_signature = FALSE;
+
+ sig = mail_config_signature_new (NULL, FALSE, FALSE);
+ mail_config_add_signature (sig);
+ account->id->sig_uid = g_strdup (sig->uid);
+
/* HACK: yeah this is a hack, who cares? */
cmd = g_strdup_printf("cp \'%s\' \'%s\'", nstr, sig->filename);
system(cmd);