From 8cd20682159f0e683cdd81af54611b9511f873a1 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.
---
 modules/calendar/e-cal-shell-view-private.h | 1 +
 modules/calendar/e-cal-shell-view.c         | 2 +-
 modules/calendar/e-memo-shell-migrate.c     | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'modules/calendar')

diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index 0f9235046c..b3b4092788 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -32,6 +32,7 @@
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-sexp.h>
 
+#include "e-util/e-account-utils.h"
 #include "e-util/e-selection.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-file-utils.h"
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index ce2e258441..b81b453bb0 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -474,7 +474,7 @@ cal_shell_view_update_actions (EShellView *shell_view)
 	gtk_action_set_sensitive (action, sensitive);
 
 	action = ACTION (EVENT_MEETING_NEW);
-	visible = itip_addresses_get_default () != NULL;
+	visible = e_get_default_account () != NULL;
 	gtk_action_set_visible (action, visible);
 }
 
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index a41c4e1985..b760990f6b 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -24,12 +24,11 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <camel/camel.h>
-#include <libedataserver/e-account.h>
-#include <libedataserver/e-account-list.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-group.h>
 #include <libedataserver/e-source-list.h>
 
+#include "e-util/e-account-utils.h"
 #include "calendar/gui/calendar-config-keys.h"
 #include "shell/e-shell.h"
 
@@ -249,7 +248,9 @@ e_memo_shell_backend_migrate (EShellBackend *shell_backend,
 		CamelURL *url;
 		EIterator *it;
 		GConfClient *gconf_client = gconf_client_get_default ();
-		al = e_account_list_new (gconf_client);
+
+		al = e_get_account_list ();
+
 		for (it = e_list_get_iterator ((EList *)al);
 				e_iterator_is_valid (it);
 				e_iterator_next (it)) {
@@ -260,7 +261,7 @@ e_memo_shell_backend_migrate (EShellBackend *shell_backend,
 			add_gw_esource (source_list, a->name, _("Notes"), url, gconf_client);
 			camel_url_free (url);
 		}
-		g_object_unref (al);
+
 		g_object_unref (gconf_client);
 	}
 
-- 
cgit v1.2.3