diff options
Diffstat (limited to 'mail/mail-config.c')
| -rw-r--r-- | mail/mail-config.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/mail/mail-config.c b/mail/mail-config.c index beff15b4c4..1c1783b8bd 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -1280,12 +1280,6 @@ mail_config_remove_account (MailConfigAccount *account) return config->accounts; } -int -mail_config_get_default_account_num (void) -{ - return gconf_client_get_int (config->gconf, "/apps/evolution/mail/default_account", NULL); -} - void mail_config_set_default_account (const MailConfigAccount *account) { @@ -1951,7 +1945,6 @@ mail_config_signature_emit_event (MailConfigSigEvent event, MailConfigSignature gchar * mail_config_signature_run_script (gchar *script) { - GConfClient *gconf; int result, status; int in_fds[2]; pid_t pid; @@ -1961,8 +1954,6 @@ mail_config_signature_run_script (gchar *script) return NULL; } - gconf = gconf_client_get_default (); - if (!(pid = fork ())) { /* child process */ int maxfd, i; @@ -1994,13 +1985,16 @@ mail_config_signature_run_script (gchar *script) CamelStreamMem *memstream; CamelMimeFilter *charenc; CamelStream *stream; + GConfClient *gconf; GByteArray *buffer; - const char *charset; + char *charset; char *content; /* parent process */ close (in_fds[1]); + gconf = gconf_client_get_default (); + stream = camel_stream_fs_new_with_fd (in_fds[0]); memstream = (CamelStreamMem *) camel_stream_mem_new (); |