[evolution/account-mgmt: 50/50] mail fixup

[Matthew Barnes <mbarnes src gnome org>]

commit 2c067e24ab66f9648cd9b8cd463274e10c9fd215
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Dec 23 11:21:51 2011 -0500

    mail fixup

 mail/em-account-editor.h |    2 --
 mail/em-utils.c          |    5 -----
 2 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index e644cf3..7b584c6 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -28,8 +28,6 @@
 #include <mail/em-config.h>
 #include <mail/e-mail-backend.h>
 
-#include <libedataserver/e-account.h>
-
 /* Standard GObject macros */
 #define EM_TYPE_ACCOUNT_EDITOR \
 	(em_account_editor_get_type ())
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 5c5b9bd..fc4b42d 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1702,15 +1702,10 @@ search_address_in_addressbooks (const gchar *address,
 		const gchar *display_name;
 		const gchar *uid;
 		GError *err = NULL;
-		const gchar *display_name;
-		const gchar *uid;
 
 		uid = e_source_get_uid (source);
 		display_name = e_source_get_display_name (source);
 
-		uid = e_source_peek_uid (source);
-		display_name = e_source_peek_name (source);
-
 		/* failed to load this book last time, skip it now */
 		if (g_hash_table_lookup (emu_broken_books_hash, uid) != NULL) {
 			d(printf ("%s: skipping broken book '%s'\n",