diff options
| -rw-r--r-- | 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 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); |