[evolution/account-mgmt: 1/52] Refactor CompEditor pages to isolate EAccount usage.

[Matthew Barnes <mbarnes src gnome org>]

commit 084302f28ad46c2ab2444aeeed549555bc74ab87
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Apr 26 16:23:40 2011 -0400

    Refactor CompEditor pages to isolate EAccount usage.
    
    Hide EAccount usage behind a generic API so EAccount can be replaced
    more easily.

 calendar/gui/dialogs/event-page.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 086f3ef..2df1c3c 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -246,10 +246,17 @@ get_current_identity (EventPage *page,
 
 		/* XXX EIterator misuses const. */
 		account = (EAccount *) e_iterator_get (iterator);
+<<<<<<< HEAD
 
 		id_name = account->id->name;
 		id_address = account->id->address;
 
+=======
+
+		id_name = account->id->name;
+		id_address = account->id->address;
+
+>>>>>>> Refactor CompEditor pages to isolate EAccount usage.
 		identity = g_strdup_printf ("%s <%s>", id_name, id_address);
 		match = (g_ascii_strcasecmp (text, identity) == 0);
 		g_free (identity);