From 801450b0f391a90ce1b2726ecb571026819673b9 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 Apr 2011 09:20:50 -0400
Subject: Remove redundant EAccountList utilities.

Kill itip_addresses_get() and itip_addresses_get_default(), and use
e_get_account_list() and e_get_default_account() instead.
---
 mail/em-filter-source-element.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'mail')

diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index ab4c049183..ee6785f15c 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -32,7 +32,8 @@
 #include <gtk/gtk.h>
 #include <camel/camel.h>
 #include <libedataserver/e-sexp.h>
-#include <libedataserver/e-account-list.h>
+
+#include <e-util/e-account-utils.h>
 
 #include "filter/e-filter-part.h"
 
@@ -342,15 +343,12 @@ em_filter_source_element_get_sources (EMFilterSourceElement *fs)
 {
 	EAccountList *accounts;
 	const EAccount *account;
-	GConfClient *gconf;
 	EIterator *it;
 	gchar *uri;
 	CamelURL *url;
 
 	/* should this get the global object from mail? */
-	gconf = gconf_client_get_default ();
-	accounts = e_account_list_new (gconf);
-	g_object_unref (gconf);
+	accounts = e_get_account_list ();
 
 	for (it = e_list_get_iterator ((EList *)accounts);
 	     e_iterator_is_valid (it);
@@ -369,6 +367,6 @@ em_filter_source_element_get_sources (EMFilterSourceElement *fs)
 			g_free (uri);
 		}
 	}
+
 	g_object_unref (it);
-	g_object_unref (accounts);
 }
-- 
cgit