Use gconf to get the paned size. (folder_browser_set_message_preview):

2003-01-07  Jeffrey Stedfast  <fejj@ximian.com>

	* folder-browser.c (save_cursor_pos): Use gconf to get the paned
	size.
	(folder_browser_set_message_preview): Same.
	(folder_browser_toggle_hide_deleted): Use gconf to set the
	hide-deleted state.
	(folder_browser_set_message_display_style): Same but for the
	message_display_style.
	(fb_resize_cb): Save the paned_size via gconf.
	(paned_size_changed): Callback for when the paned_size gets
	changed. Change the folder-browser's paned size to the new
	setting.
	(folder_browser_gui_init): Listen to changes to the paned_size and
	also get the initial size from gconf.

	* message-list.c (message_list_set_folder): Use gconf.
	(regen_list_regen): Use gconf.

	* message-browser.c (transfer_msg_done): Use gconf to get the
	hide_deleted setting.

	* mail-account-gui.c (sig_add_new_signature): Use gconf.

	* folder-browser-ui.c (folder_browser_ui_add_list): Use gconf.

	* folder-browser.c (save_cursor_pos): Use gconf.
	(folder_browser_set_message_preview): Same.
	(folder_browser_toggle_hide_deleted): Here too.
	(folder_browser_set_message_display_style): And here.
	(folder_browser_gui_init): Here too.
	(done_message_selected): And here.

	* mail-config.c (mail_config_get_thread_subject): Removed.
	(mail_config_set_thread_subject): Removed.
	(mail_config_get_empty_trash_on_exit): Removed.
	(mail_config_set_empty_trash_on_exit): Removed.
	(mail_config_get_last_filesel_dir): Removed.
	(mail_config_set_last_filesel_dir): Removed.
	(mail_config_get_hide_deleted): Removed.
	(mail_config_set_hide_deleted): Removed.
	(mail_config_get_paned_size): Removed.
	(mail_config_set_paned_size): Removed.
	(mail_config_get_send_html): Removed.
	(mail_config_set_send_html): Removed.
	(mail_config_get_confirm_unwanted_html): Removed.
	(mail_config_set_confirm_unwanted_html): Removed.
	(mail_config_get_citation_highlight): Removed.
	(mail_config_set_citation_highlight): Removed.
	(mail_config_get_citation_color): Removed.
	(mail_config_set_citation_color): Removed.
	(mail_config_get_do_seen_timeout): Removed.
	(mail_config_set_do_seen_timeout): Removed.
	(mail_config_get_mark_as_seen_timeout): Removed.
	(mail_config_set_mark_as_seen_timeout): Removed.
	(mail_config_get_prompt_empty_subject): Removed.
	(mail_config_set_prompt_empty_subject): Removed.
	(mail_config_get_prompt_only_bcc): Removed.
	(mail_config_set_prompt_only_bcc): Removed.
	(mail_config_get_confirm_expunge): Removed.
	(mail_config_set_confirm_expunge): Removed.
	(mail_config_get_confirm_goto_next_folder): Removed.
	(mail_config_set_confirm_goto_next_folder): Removed.
	(mail_config_get_goto_next_folder): Removed.
	(mail_config_set_goto_next_folder): Removed.
	(mail_config_get_http_mode): Removed.
	(mail_config_set_http_mode): Removed.
	(mail_config_get_default_forward_style): Removed.
	(mail_config_set_default_forward_style): Removed.
	(mail_config_get_default_reply_style): Removed.
	(mail_config_set_default_reply_style): Removed.
	(mail_config_get_message_display_style): Removed.
	(mail_config_set_message_display_style): Removed.
	(mail_config_get_default_charset): Removed.
	(mail_config_set_default_charset): Removed.
	(mail_config_get_x_mailer_display_style): Removed.
	(mail_config_set_x_mailer_display_style): Removed.

	* subscribe-dialog.c (populate_store_list): Use the list of
	accounts. We can't get the list of sources anymore.
	(populate_store_foreach): Updated.

	* mail-callbacks.c (guess_me_from_accounts): Use account->enabled.
	(mail_generate_reply): Same.
	(empty_trash): Here too.

	* mail-accounts.c (account_delete_clicked): Use account->enabled
	rather than source->enabled.
	(account_able_clicked): Same.
	(account_cursor_change): Here too.
	(mail_accounts_load): And here.

	* component-factory.c (owner_unset_cb): Use gconf empty-on-exit
	settings.
	(mail_load_storages): Use account->enabled rather than
	account->source->enabled. The struct changed.

	* mail-composer-prefs.c (sig_add): Get the send_html pref from gconf.

	* message-tag-followup.c (target_date_new): Use gconf.

	* mail-config.c (mail_config_get_week_start_day): Removed.

	* mail-tools.c (mail_tool_quote_message): Use gconf here too, but
	we don't need to parse the colour - just use it as a raw string.
	(mail_tool_forward_message): Use gconf.

	* mail-format.c (mail_format_data_wrapper_write_to_stream): Use gconf.
	(write_headers): Use gconf.
	(handle_text_plain): Same.

	* mail-display.c (mail_text_write): Updated to use gconf and parse
	GdkColour strings.
	(on_url_requested): Updated to use gconf.

	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Use gconf
	rather than the old mail-config APIs which will be removed.
	(ask_confirm_for_empty_subject): Same.
	(ask_confirm_for_only_bcc): Here too.
	(composer_get_message): And here.
	(create_msg_composer): Same.
	(transfer_msg_done): Again here.
	(delete_msg): Here too.
	(confirm_expunge): And finally here.

	* mail-config.c (mail_config_write): Use gconf.
	(mail_config_get_sources): Removed.

	* mail-account-gui.c (mail_account_gui_save): No need to save
	enabled-state anymore for a source.

	* mail-config-druid.c (wizard_finish_cb): Instead of setting
	account->source->enabled to TRUE, just set account->enabled to
	TRUE. The structures changed a bit.

	* mail-send-recv.c (mail_send_receive): Get the list of accounts
	instead of sources, and pass them along to build_dialogue. I'm
	trying to get rid of the mail_config_get_sources() api.
	(mail_autoreceive_setup): Here too.

	* mail-config.c (mail_config_get_filter_log): Removed.
	(mail_config_set_filter_log): Removed.
	(mail_config_get_filter_log_path): Removed.
	(mail_config_set_filter_log_path): Removed.
	(mail_config_get_new_mail_notify): Removed.
	(mail_config_set_new_mail_notify): Removed.
	(mail_config_get_new_mail_notify_sound_file): Removed.
	(mail_config_set_new_mail_notify_sound_file): Removed.

	* mail-session.c (main_get_filter_driver): Updated to use the
	gconf settings.

svn path=/trunk/; revision=19271

1 files changed, 5 insertions, 79 deletions

diff --git a/mail/mail-config.h b/mail/mail-config.h
index 3b8732b97b..792cdc89ca 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -55,12 +55,13 @@ typedef struct {
 	gboolean auto_check;
 	int auto_check_time;
 	gboolean save_passwd;
-	gboolean enabled;
 } MailConfigService;
 
 typedef struct {
 	char *name;
 	
+	gboolean enabled;
+	
 	MailConfigIdentity *id;
 	MailConfigService *source;
 	MailConfigService *transport;
@@ -157,17 +158,6 @@ void mail_config_write_on_exit (void);
 gboolean mail_config_is_configured            (void);
 gboolean mail_config_is_corrupt               (void);
 
-gboolean    mail_config_get_filter_log        (void);
-void        mail_config_set_filter_log        (gboolean value);
-const char *mail_config_get_filter_log_path   (void);
-void        mail_config_set_filter_log_path   (const char *path);
-
-const char *mail_config_get_last_filesel_dir  (void);
-void        mail_config_set_last_filesel_dir  (const char *path);
-
-gboolean mail_config_get_empty_trash_on_exit  (void);
-void     mail_config_set_empty_trash_on_exit  (gboolean value);
-
 gboolean mail_config_get_thread_list          (const char *uri);
 void     mail_config_set_thread_list          (const char *uri, gboolean value);
 
@@ -177,73 +167,15 @@ 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);
 
-gboolean mail_config_get_hide_deleted         (void);
-void     mail_config_set_hide_deleted         (gboolean value);
-
 int      mail_config_get_paned_size           (void);
 void     mail_config_set_paned_size           (int size);
 
-gboolean mail_config_get_send_html            (void);
-void     mail_config_set_send_html            (gboolean send_html);
-
-gboolean mail_config_get_confirm_unwanted_html (void);
-void     mail_config_set_confirm_unwanted_html (gboolean html_warning);
-
-gboolean mail_config_get_citation_highlight   (void);
-void     mail_config_set_citation_highlight   (gboolean);
-
-guint32  mail_config_get_citation_color       (void);
-void     mail_config_set_citation_color       (guint32);
-
 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);
 void        mail_config_set_label_color (int label, guint32 color);
 const char *mail_config_get_label_color_string (int label);
 
-gint     mail_config_get_do_seen_timeout      (void);
-void     mail_config_set_do_seen_timeout      (gboolean do_seen_timeout);
-
-int      mail_config_get_mark_as_seen_timeout (void);
-void     mail_config_set_mark_as_seen_timeout (int timeout);
-
-gboolean mail_config_get_prompt_empty_subject (void);
-void     mail_config_set_prompt_empty_subject (gboolean value);
-
-gboolean mail_config_get_prompt_only_bcc (void);
-void     mail_config_set_prompt_only_bcc (gboolean value);
-
-gboolean mail_config_get_confirm_expunge (void);
-void     mail_config_set_confirm_expunge (gboolean value);
-
-gboolean mail_config_get_confirm_goto_next_folder (void);
-void     mail_config_set_confirm_goto_next_folder (gboolean value);
-gboolean mail_config_get_goto_next_folder (void);
-void     mail_config_set_goto_next_folder (gboolean value);
-
-MailConfigHTTPMode mail_config_get_http_mode (void);
-void               mail_config_set_http_mode (MailConfigHTTPMode);
-
-MailConfigForwardStyle mail_config_get_default_forward_style (void);
-void                   mail_config_set_default_forward_style (MailConfigForwardStyle style);
-
-MailConfigReplyStyle mail_config_get_default_reply_style (void);
-void                   mail_config_set_default_reply_style (MailConfigReplyStyle style);
-
-MailConfigDisplayStyle mail_config_get_message_display_style (void);
-void                   mail_config_set_message_display_style (MailConfigDisplayStyle style);
-
-MailConfigNewMailNotify mail_config_get_new_mail_notify (void);
-void                    mail_config_set_new_mail_notify (MailConfigNewMailNotify type);
-const char             *mail_config_get_new_mail_notify_sound_file (void);
-void                    mail_config_set_new_mail_notify_sound_file (const char *filename);
-
-MailConfigXMailerDisplayStyle mail_config_get_x_mailer_display_style (void);
-void                          mail_config_set_x_mailer_display_style (MailConfigXMailerDisplayStyle style);
-
-const char *mail_config_get_default_charset (void);
-void        mail_config_set_default_charset (const char *charset);
-
 void mail_config_service_set_save_passwd (MailConfigService *service, gboolean save_passwd);
 
 gboolean                  mail_config_find_account              (const MailConfigAccount *account);
@@ -269,9 +201,6 @@ void mail_config_uri_deleted(GCompareFunc uri_cmp, const char *uri);
 
 GtkType evolution_mail_config_get_type (void);
 
-/* convenience functions to help ease the transition over to the new codebase */
-GSList *mail_config_get_sources (void);
-
 /* static utility functions */
 char *mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix);
 char *mail_config_folder_to_safe_url (CamelFolder *folder);
@@ -282,7 +211,7 @@ gboolean mail_config_check_service (const char *url, CamelProviderType type, GLi
 
 gboolean evolution_mail_config_factory_init (void);
 
-GList * mail_config_get_signature_list (void);
+GList *mail_config_get_signature_list (void);
 MailConfigSignature *mail_config_signature_add (gboolean html, const gchar *script);
 void mail_config_signature_delete (MailConfigSignature *sig);
 void mail_config_signature_write (MailConfigSignature *sig);
@@ -304,11 +233,8 @@ void mail_config_signature_register_client (MailConfigSignatureClient client, gp
 void mail_config_signature_unregister_client (MailConfigSignatureClient client, gpointer data);
 void mail_config_signature_emit_event (MailConfigSigEvent event, MailConfigSignature *sig);
 
-void mail_config_write_account_sig (MailConfigAccount *account, gint i);
-gchar * mail_config_signature_run_script (gchar *script);
-
-int mail_config_get_week_start_day(void);
-int mail_config_get_time_24hour(void);
+void mail_config_write_account_sig (MailConfigAccount *account, int i);
+char *mail_config_signature_run_script (char *script);
 
 #ifdef __cplusplus
 }