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, 27 insertions, 23 deletions

diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 3c11954b45..6ec4bf14e0 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -160,12 +160,9 @@ folder_browser_destroy (GtkObject *object)
 {
 	FolderBrowser *folder_browser;
 	CORBA_Environment ev;
-	GConfClient *gconf;
 	
 	folder_browser = FOLDER_BROWSER (object);
-	
-	gconf = gconf_client_get_default ();
-	
+		
 	CORBA_exception_init (&ev);
 	
 	if (folder_browser->seen_id != 0) {
@@ -1121,7 +1118,7 @@ save_cursor_pos (FolderBrowser *fb)
 	e_tree_get_cell_geometry (fb->message_list->tree, row, 0,
 				  NULL, &y, NULL, &height);
 	
-	gconf = gconf_client_get_default ();
+	gconf = mail_config_get_gconf_client ();
 	paned_size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL);
 	
 	adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (fb->message_list));
@@ -1156,9 +1153,9 @@ folder_browser_set_message_preview (FolderBrowser *folder_browser, gboolean show
 	
 	folder_browser->preview_shown = show_preview;
 	
-	gconf = gconf_client_get_default ();
+	gconf = mail_config_get_gconf_client ();
 	paned_size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL);
-	
+
 	if (show_preview) {
 		y = save_cursor_pos (folder_browser);
 		gtk_paned_set_position (GTK_PANED (folder_browser->vpaned), paned_size);
@@ -1300,13 +1297,17 @@ folder_browser_toggle_preview (BonoboUIComponent           *component,
 {
 	FolderBrowser *fb = user_data;
 	gboolean bstate;
+	GConfClient *gconf;
 
 	if (type != Bonobo_UIComponent_STATE_CHANGED || fb->message_list == NULL)
 		return;
 	
 	bstate = atoi(state);
 	e_meta_set_bool(fb->meta, "show_preview", bstate);
-	gconf_client_set_bool (gconf_client_get_default(), "/apps/evolution/mail/display/show_preview", bstate, NULL);
+	
+	gconf = mail_config_get_gconf_client ();
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/display/show_preview", bstate, NULL);
+	
 	folder_browser_set_message_preview (fb, bstate);
 }
 
@@ -1320,13 +1321,17 @@ folder_browser_toggle_threads (BonoboUIComponent           *component,
 	FolderBrowser *fb = user_data;
 	int prev_state;
 	gboolean bstate;
+	GConfClient *gconf;
 	
 	if (type != Bonobo_UIComponent_STATE_CHANGED || fb->message_list == NULL)
 		return;
 
 	bstate = atoi(state);
 	e_meta_set_bool(fb->meta, "thread_list", bstate);
-	gconf_client_set_bool (gconf_client_get_default (), "/apps/evolution/mail/display/thread_list", bstate, NULL);
+	
+	gconf = mail_config_get_gconf_client ();
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/display/thread_list", bstate, NULL);
+	
 	message_list_set_threaded (fb->message_list, bstate);
 	
 	prev_state = fb->selection_state;
@@ -1347,7 +1352,7 @@ folder_browser_toggle_hide_deleted (BonoboUIComponent           *component,
 	if (type != Bonobo_UIComponent_STATE_CHANGED || fb->message_list == NULL)
 		return;
 	
-	gconf = gconf_client_get_default ();
+	gconf = mail_config_get_gconf_client ();
 	gconf_client_set_bool (gconf, "/apps/evolution/mail/display/show_deleted",
 			       !atoi (state), NULL);
 	
@@ -1372,9 +1377,7 @@ folder_browser_set_message_display_style (BonoboUIComponent           *component
 	    || fb->message_list == NULL)
 		return;
 	
-	gconf = gconf_client_get_default ();
-	
-	printf ("message display style: %s\n", path);
+	gconf = mail_config_get_gconf_client ();
 	
 	for (i = 0; i < MAIL_CONFIG_DISPLAY_MAX; i++) {
 		if (strstr (message_display_styles[i], path)) {
@@ -1383,6 +1386,7 @@ folder_browser_set_message_display_style (BonoboUIComponent           *component
 			
 			if (fb->pref_master)
 				gconf_client_set_int (gconf, "/apps/evolution/mail/display/message_style", i, NULL);
+			
 			return;
 		}
 	}
@@ -2313,12 +2317,12 @@ static gboolean
 fb_resize_cb (GtkWidget *w, GdkEventButton *e, FolderBrowser *fb)
 {
 	GConfClient *gconf;
-
-	gconf = gconf_client_get_default ();
-
-	if (GTK_WIDGET_REALIZED (w) && fb->preview_shown)
+	
+	if (GTK_WIDGET_REALIZED (w) && fb->preview_shown) {
+		gconf = mail_config_get_gconf_client ();
 		gconf_client_set_int (gconf, "/apps/evolution/mail/display/paned_size", gtk_paned_get_position (GTK_PANED (w)), NULL);
-
+	}
+	
 	return FALSE;
 }
 
@@ -2326,9 +2330,11 @@ fb_resize_cb (GtkWidget *w, GdkEventButton *e, FolderBrowser *fb)
 static void
 paned_realised(GtkWidget *w, FolderBrowser *fb)
 {
+	GConfClient *gconf;
 	int size;
-
-	size = gconf_client_get_int (gconf_client_get_default (), "/apps/evolution/mail/display/paned_size", NULL);
+	
+	gconf = mail_config_get_gconf_client ();
+	size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL);
 	gtk_paned_set_position (GTK_PANED (fb->vpaned), size);
 }
 
@@ -2415,12 +2421,10 @@ done_message_selected (CamelFolder *folder, const char *uid, CamelMimeMessage *m
 	GConfClient *gconf;
 	int timeout;
 	
-	gconf = gconf_client_get_default ();
-	
 	if (folder != fb->folder || fb->mail_display == NULL)
 		return;
 	
-	gconf = gconf_client_get_default ();
+	gconf = mail_config_get_gconf_client ();
 	timeout = gconf_client_get_int (gconf, "/apps/evolution/mail/display/mark_seen_timeout", NULL);
 	
 	info = camel_folder_get_message_info (fb->folder, uid);