From 04cf783ce801609dc80d0983f3a3d4c4d29f29aa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Apr 2011 16:23:40 -0400 Subject: 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 file changed, 7 insertions(+) (limited to 'calendar') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 813b2dcc33..2797bcd9ec 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -247,10 +247,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); -- cgit v1.2.3