From 5c1d44991bfc0a3fa62957e7e6a7aa6e73dc7c2f Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 8 Jan 2003 18:35:52 +0000 Subject: Save the setting via gconf. (mail_config_add_account): Immediately save 2003-01-08 Jeffrey Stedfast * mail-config.c (mail_config_set_default_account): Save the setting via gconf. (mail_config_add_account): Immediately save the list of accounts. (mail_config_remove_account): Same. (mail_config_signature_run_script): g_free the charset value and use the composer's charset rather than the display charset. (mail_config_get_default_account_num): Removed. svn path=/trunk/; revision=19285 --- mail/ChangeLog | 1 + mail/mail-config.c | 14 ++++---------- mail/mail-config.h | 4 ---- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 41ca8f95b5..61723a00c8 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -6,6 +6,7 @@ (mail_config_remove_account): Same. (mail_config_signature_run_script): g_free the charset value and use the composer's charset rather than the display charset. + (mail_config_get_default_account_num): Removed. 2003-01-07 Jeffrey Stedfast 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 (); diff --git a/mail/mail-config.h b/mail/mail-config.h index 792cdc89ca..b0f6042d84 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -167,9 +167,6 @@ void mail_config_set_thread_subject (gboolean thread_subject); gboolean mail_config_get_show_preview (const char *uri); void mail_config_set_show_preview (const char *uri, gboolean value); -int mail_config_get_paned_size (void); -void mail_config_set_paned_size (int size); - const char *mail_config_get_label_name (int label); void mail_config_set_label_name (int label, const char *name); guint32 mail_config_get_label_color (int label); @@ -180,7 +177,6 @@ void mail_config_service_set_save_passwd (MailConfigService *service, gboolean s gboolean mail_config_find_account (const MailConfigAccount *account); const MailConfigAccount *mail_config_get_default_account (void); -int mail_config_get_default_account_num (void); const MailConfigAccount *mail_config_get_account_by_name (const char *account_name); const MailConfigAccount *mail_config_get_account_by_source_url (const char *url); const MailConfigAccount *mail_config_get_account_by_transport_url (const char *url); -- cgit