aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-04-27 04:23:40 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-03 11:00:38 +0800
commit04cf783ce801609dc80d0983f3a3d4c4d29f29aa (patch)
tree0530ed68d32608bbf487aaa4b42649840056d883 /calendar/gui
parentc799f2fe6db35273f240f2e6d1d677a36d4bd046 (diff)
downloadgsoc2013-evolution-04cf783ce801609dc80d0983f3a3d4c4d29f29aa.tar
gsoc2013-evolution-04cf783ce801609dc80d0983f3a3d4c4d29f29aa.tar.gz
gsoc2013-evolution-04cf783ce801609dc80d0983f3a3d4c4d29f29aa.tar.bz2
gsoc2013-evolution-04cf783ce801609dc80d0983f3a3d4c4d29f29aa.tar.lz
gsoc2013-evolution-04cf783ce801609dc80d0983f3a3d4c4d29f29aa.tar.xz
gsoc2013-evolution-04cf783ce801609dc80d0983f3a3d4c4d29f29aa.tar.zst
gsoc2013-evolution-04cf783ce801609dc80d0983f3a3d4c4d29f29aa.zip
Refactor CompEditor pages to isolate EAccount usage.
Hide EAccount usage behind a generic API so EAccount can be replaced more easily.
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/dialogs/event-page.c7
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);