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.

5 files changed, 13 insertions, 8 deletions

diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 808df901d3..b66063dd73 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -33,6 +33,7 @@
 #include <glib/gi18n.h>
 
 #include <misc/e-dateedit.h>
+#include <e-util/e-account-utils.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/e-util-private.h>
 #include <e-util/e-ui-manager.h>
@@ -677,7 +678,7 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 				EAccount *account;
 				EIterator *it;
 
-				accounts = itip_addresses_get ();
+				accounts = e_get_account_list ();
 				for (it = e_list_get_iterator ((EList *)accounts);
 					e_iterator_is_valid (it);
 					e_iterator_next (it)) {
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index ccbbcd03bb..9560f590d2 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -43,6 +43,7 @@
 #include "../e-timezone-entry.h"
 
 #include "e-util/e-util.h"
+#include "e-util/e-account-utils.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-dialog-widgets.h"
@@ -3153,7 +3154,7 @@ event_page_select_organizer (EventPage *epage, const gchar *backend_address)
 	ESource *source = NULL;
 	const gchar *user_addr = NULL;
 
-	def_account = itip_addresses_get_default ();
+	def_account = e_get_default_account ();
 	if (def_account && def_account->enabled)
 		def_address = g_strdup_printf("%s <%s>", def_account->id->name, def_account->id->address);
 
@@ -3230,7 +3231,7 @@ event_page_construct (EventPage *epage,
 		return NULL;
 	}
 
-	priv->accounts = itip_addresses_get ();
+	priv->accounts = e_get_account_list ();
 	for (it = e_list_get_iterator ((EList *)priv->accounts);
 	     e_iterator_is_valid (it);
 	     e_iterator_next (it)) {
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 424b3e370c..6e5313eec7 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -42,6 +42,7 @@
 #include "misc/e-buffer-tagger.h"
 
 #include "e-util/e-util.h"
+#include "e-util/e-account-utils.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-dialog-widgets.h"
@@ -1081,7 +1082,7 @@ memo_page_select_organizer (MemoPage *mpage, const gchar *backend_address)
 	ESource *source = NULL;
 	const gchar *user_addr = NULL;
 
-	def_account = itip_addresses_get_default ();
+	def_account = e_get_default_account ();
 	if (def_account && def_account->enabled)
 		def_address = g_strdup_printf("%s <%s>", def_account->id->name, def_account->id->address);
 
@@ -1153,7 +1154,7 @@ memo_page_construct (MemoPage *mpage)
 	}
 
 	if (flags & COMP_EDITOR_IS_SHARED) {
-		priv->accounts = itip_addresses_get ();
+		priv->accounts = e_get_account_list ();
 		for (it = e_list_get_iterator ((EList *)priv->accounts);
 				e_iterator_is_valid (it);
 				e_iterator_next (it)) {
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 91d4598fdf..2deee3b6ec 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
+#include "e-util/e-account-utils.h"
 #include "e-util/e-plugin-ui.h"
 #include "e-util/e-util-private.h"
 
@@ -425,7 +426,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 			EAccount *account;
 			EIterator *it;
 
-			accounts = itip_addresses_get ();
+			accounts = e_get_account_list ();
 			for (it = e_list_get_iterator ((EList *)accounts);
 				e_iterator_is_valid (it);
 				e_iterator_next (it)) {
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index f416d53d88..0ddd325448 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -46,6 +46,7 @@
 #include "task-page.h"
 
 #include "e-util/e-util.h"
+#include "e-util/e-account-utils.h"
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-util-private.h"
@@ -2004,7 +2005,7 @@ task_page_select_organizer (TaskPage *tpage, const gchar *backend_address)
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tpage));
 	client = comp_editor_get_client (editor);
 
-	def_account = itip_addresses_get_default ();
+	def_account = e_get_default_account ();
 	if (def_account && def_account->enabled)
 		def_address = g_strdup_printf("%s <%s>", def_account->id->name, def_account->id->address);
 
@@ -2081,7 +2082,7 @@ task_page_construct (TaskPage *tpage,
 		return NULL;
 	}
 
-	priv->accounts = itip_addresses_get ();
+	priv->accounts = e_get_account_list ();
 	for (it = e_list_get_iterator ((EList *)priv->accounts);
 	     e_iterator_is_valid (it);
 	     e_iterator_next (it)) {