aboutsummaryrefslogtreecommitdiffstats
path: root/modules/calendar/e-memo-shell-migrate.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-04-26 21:20:50 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:57 +0800
commit801450b0f391a90ce1b2726ecb571026819673b9 (patch)
tree611d5793ba1fcd3aa45b686be1041828a50a09dd /modules/calendar/e-memo-shell-migrate.c
parentd2e0897fcffad81ad5e1518d9dcb969066b68412 (diff)
downloadgsoc2013-evolution-801450b0f391a90ce1b2726ecb571026819673b9.tar
gsoc2013-evolution-801450b0f391a90ce1b2726ecb571026819673b9.tar.gz
gsoc2013-evolution-801450b0f391a90ce1b2726ecb571026819673b9.tar.bz2
gsoc2013-evolution-801450b0f391a90ce1b2726ecb571026819673b9.tar.lz
gsoc2013-evolution-801450b0f391a90ce1b2726ecb571026819673b9.tar.xz
gsoc2013-evolution-801450b0f391a90ce1b2726ecb571026819673b9.tar.zst
gsoc2013-evolution-801450b0f391a90ce1b2726ecb571026819673b9.zip
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.
Diffstat (limited to 'modules/calendar/e-memo-shell-migrate.c')
-rw-r--r--modules/calendar/e-memo-shell-migrate.c9
1 files changed, 5 insertions, 4 deletions
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);
}