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, 42 insertions, 14 deletions

diff --git a/mail/mail-display.c b/mail/mail-display.c
index 164372ae5c..122dd04e14 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -38,6 +38,9 @@
 #include <gtk/gtkinvisible.h>
 #include <libgnome/gnome-program.h>
 
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <bonobo/bonobo-control-frame.h>
@@ -235,18 +238,19 @@ make_safe_filename (const char *prefix,CamelMimePart *part)
 static void
 save_data_cb (GtkWidget *widget, gpointer user_data)
 {
-	GtkFileSelection *file_select = (GtkFileSelection *)
-		gtk_widget_get_ancestor (widget, GTK_TYPE_FILE_SELECTION);
+	GtkFileSelection *file_select;
+	GConfClient *gconf;
 	char *dir;
 	
+	file_select = (GtkFileSelection *) gtk_widget_get_ancestor (widget, GTK_TYPE_FILE_SELECTION);
+	
 	/* uh, this doesn't really feel right, but i dont know what to do better */
 	gtk_widget_hide (GTK_WIDGET (file_select));
-	write_data_to_file (user_data, gtk_file_selection_get_filename (file_select),
-			    FALSE);
+	write_data_to_file (user_data, gtk_file_selection_get_filename (file_select), FALSE);
 	
 	/* preserve the pathname */
 	dir = g_path_get_dirname (gtk_file_selection_get_filename (file_select));
-	mail_config_set_last_filesel_dir (dir);
+	gconf_client_set_string (gconf, "/apps/evolution/mail/save_dir", dir, NULL);
 	g_free (dir);
 	
 	gtk_widget_destroy (GTK_WIDGET (file_select));
@@ -307,11 +311,15 @@ static void
 save_part (CamelMimePart *part)
 {
 	GtkFileSelection *file_select;
-	char *filename, *base;
+	char *filename, *dir, *base;
+	GConfClient *gconf;
 	
 	camel_object_ref (CAMEL_OBJECT (part));
 	
-	filename = make_safe_filename (mail_config_get_last_filesel_dir (), part);
+	gconf = gconf_client_get_default ();
+	dir = gconf_client_get_string (gconf, "/apps/evolution/mail/save_dir", NULL);
+	filename = make_safe_filename (dir, part);
+	g_free (dir);
 	
 	file_select = GTK_FILE_SELECTION (
 		gtk_file_selection_new (_("Save Attachment")));
@@ -1191,10 +1199,13 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
 		  gpointer user_data)
 {
 	MailDisplay *md = user_data;
+	GConfClient *gconf;
 	GHashTable *urls;
 	CamelMedium *medium;
 	GByteArray *ba;
 	
+	gconf = gconf_client_get_default ();
+	
 	urls = g_datalist_get_data (md->data, "part_urls");
 	g_return_if_fail (urls != NULL);
 	
@@ -1252,10 +1263,13 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
 	
 	/* See if it's something we can load. */
 	if (strncmp (url, "http:", 5) == 0 || strncmp (url, "https:", 6) == 0) {
-		if (mail_config_get_http_mode () == MAIL_CONFIG_HTTP_ALWAYS ||
+		int http_mode;
+		
+		http_mode = gconf_client_get_int (gconf, "/apps/evolution/mail/display/load_http_images", NULL);
+		if (http_mode == MAIL_CONFIG_HTTP_ALWAYS ||
 		    g_datalist_get_data (md->data, "load_images")) {
 			fetch_remote (md, url, html, handle);
-		} else if (mail_config_get_http_mode () == MAIL_CONFIG_HTTP_SOMETIMES &&
+		} else if (http_mode == MAIL_CONFIG_HTTP_SOMETIMES &&
 			   !g_datalist_get_data (md->data, "checking_from")) {
 			const CamelInternetAddress *from;
 			const char *name, *addr;
@@ -1264,7 +1278,7 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
 			g_datalist_set_data (md->data, "checking_from", GINT_TO_POINTER (1));
 			
 			/* Make sure we aren't deal w/ some sort of a
-                           pathological message w/o a From: header */
+			   pathological message w/o a From: header */
 			if (from != NULL && camel_internet_address_get (from, 0, &name, &addr))
 				e_book_query_address_default (addr, ebook_callback, md);
 			else
@@ -1666,17 +1680,27 @@ mail_text_write (MailDisplayStream *stream, MailDisplay *md, CamelMimePart *part
 {
 	CamelStreamFilter *filtered_stream;
 	CamelMimeFilter *html_filter;
-	guint32 flags;
+	GConfClient *gconf;
+	guint32 flags, rgb;
+	GdkColor colour;
+	char *buf;
+	
+	gconf = gconf_client_get_default ();
 	
 	flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
 	
 	if (!printing)
 		flags |= CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
 	
-	if (!printing && mail_config_get_citation_highlight ())
+	if (!printing && gconf_client_get_bool (gconf, "/apps/evolution/mail/display/mark_citations", NULL))
 		flags |= CAMEL_MIME_FILTER_TOHTML_MARK_CITATION;
 	
-	html_filter = camel_mime_filter_tohtml_new (flags, mail_config_get_citation_color ());
+	buf = gconf_client_get_string (gconf, "/apps/evolution/mail/display/citation_colour", NULL);
+	gdk_color_parse (buf ? buf : "#737373", &colour);
+	g_free (buf);
+	
+	rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8);
+	html_filter = camel_mime_filter_tohtml_new (flags, rgb);
 	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
 	camel_stream_filter_add (filtered_stream, html_filter);
 	camel_object_unref (html_filter);
@@ -1971,6 +1995,8 @@ static void
 mail_display_init (GObject *object)
 {
 	MailDisplay *mail_display = MAIL_DISPLAY (object);
+	GConfClient *gconf;
+	int style;
 	
 	mail_display->scroll            = NULL;
 	mail_display->html              = NULL;
@@ -1988,7 +2014,9 @@ mail_display_init (GObject *object)
 	g_object_ref (mail_display->invisible);
 	gtk_object_sink ((GtkObject *) mail_display->invisible);
 	
-	mail_display->display_style     = mail_config_get_message_display_style ();
+	gconf = gconf_client_get_default ();
+	style = gconf_client_get_int (gconf, "/apps/evolution/mail/format/message_display_style", NULL);
+	mail_display->display_style     = style;
 	
 	mail_display->printing          = FALSE;