Use mail-config's gconf client. (target_date_new): Same.

2003-06-06  Jeffrey Stedfast  <fejj@ximian.com>

	* message-tag-followup.c (get_week_start_day): Use mail-config's
	gconf client.
	(target_date_new): Same.

	* message-list.c (message_list_set_folder): Use mail-config's
	gconf client.
	(mail_regen_list): Same.

	* mail-tools.c (mail_tool_quote_message): Use mail-config's gconf
	client.
	(mail_tool_forward_message): Same.

	* mail-session.c (main_get_filter_driver): Use mail-config's gconf
	client.

	* mail-preferences.c (mail_preferences_init): Use mail-config's
	gconf client.
	(mail_preferences_finalise): Don't unref the gconf client.

	* mail-format.c (write_headers): Use mail-config's gconf client.
	(mail_format_data_wrapper_write_to_stream): Same.
	(handle_text_plain): And here.

	* mail-display.c (save_data_cb): Use mail-config's gconf client.
	(save_part): Same.
	(on_url_requested): Here too.
	(mail_text_write): And here.
	(mail_display_init): And here.
	(mail_display_destroy): Here too.
	(mail_display_new): Again here.

	* mail-composer-prefs.c (sig_add_cb): Use mail-config's gconf
	client.
	(mail_composer_prefs_construct): Same.

	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Use
	mail-config's gconf client.
	(ask_confirm_for_empty_subject): Same.
	(ask_confirm_for_only_bcc): Here too.
	(composer_get_message): And here.
	(create_msg_composer): Again here.
	(mail_generate_reply): Same.
	(forward): And here.
	(transfer_msg_done): "
	(delete_msg): "
	(confirm_expunge): "

	* component-factory.c (owner_unset_cb): Use mail-config's gconf
	client.

	* folder-browser-ui.c (folder_browser_ui_add_message): Use the
	mailer's gconf client.
	(folder_browser_ui_add_list): Same.
	(folder_browser_ui_add_global): Here too.

	* folder-browser.c (save_cursor_pos): Use the mailer's gconf
	client.
	(folder_browser_set_message_preview): Same.
	(folder_browser_toggle_preview): Here too.
	(folder_browser_toggle_threads): And here.
	(folder_browser_toggle_hide_deleted): Here as well.
	(folder_browser_set_message_display_style): And here.
	(fb_resize_cb): Here.
	(paned_realised): And here.
	(done_message_selected): And everywhere...

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

	* mail-config.c (mail_config_get_gconf_client): New function to
	return the global GConfClient used by the mailer.
	(mail_config_write_on_exit): On exit, free our objects and such.
	(mail_config_signature_run_script): Use config->gconf.

2003-06-04  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-callbacks.c (invert_selection): Get rid of the if-focused
	code, that will always prevent the etree from getting the
	selection inverted because the menu item will always have focus at
	this time. Fix for bug #43972.


it takes more than good relations to some of the major spirits in this
branch of the multiverse to write apps that don't leak gconf-client
refs, good coding is important, too.

that... or a 100-megaton-kill-o-zap bomb

svn path=/trunk/; revision=21410

1 files changed, 6 insertions, 5 deletions

diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c
index 3f570b963d..0f47ca66a2 100644
--- a/mail/folder-browser-ui.c
+++ b/mail/folder-browser-ui.c
@@ -44,6 +44,7 @@
 
 #include "e-util/e-meta.h"
 
+#include "mail-config.h"
 #include "mail-callbacks.h" /* almost all the verbs */
 #include "mail-session.h" /* mail_session_forget_passwords */
 
@@ -517,6 +518,8 @@ folder_browser_ui_add_message (FolderBrowser *fb)
 	GConfClient *gconf;
 	int style;
 	
+	gconf = mail_config_get_gconf_client ();
+	
 	if (fb->sensitise_state) {
 		g_hash_table_destroy(fb->sensitise_state);
 		fb->sensitise_state = NULL;
@@ -524,8 +527,6 @@ folder_browser_ui_add_message (FolderBrowser *fb)
 	
 	ui_add (fb, "message", message_verbs, message_pixcache);
 	
-	gconf = gconf_client_get_default ();
-	
 	/* Display Style */
 	style = gconf_client_get_int (gconf, "/apps/evolution/mail/display/message_style", NULL);
 	style = style >= 0 && style < MAIL_CONFIG_DISPLAY_MAX ? style : 0;
@@ -559,7 +560,7 @@ folder_browser_ui_add_list (FolderBrowser *fb)
 	GConfClient *gconf;
 	int state;
 	
-	gconf = gconf_client_get_default ();
+	gconf = mail_config_get_gconf_client ();
 	
 	if (fb->sensitise_state) {
 		g_hash_table_destroy (fb->sensitise_state);
@@ -613,6 +614,8 @@ folder_browser_ui_add_global (FolderBrowser *fb)
 	GConfClient *gconf;
 	int paned_size;
 	
+	gconf = mail_config_get_gconf_client ();
+	
 	if (fb->sensitise_state) {
 		g_hash_table_destroy (fb->sensitise_state);
 		fb->sensitise_state = NULL;
@@ -620,8 +623,6 @@ folder_browser_ui_add_global (FolderBrowser *fb)
 	
 	ui_add (fb, "global", global_verbs, global_pixcache);
 	
-	gconf = gconf_client_get_default ();
-	
 	/* (Pre)view pane size (do this first because it affects the
            preview settings - see folder_browser_set_message_preview()
            internals for details) */