diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
| commit | 00e495279937c6495d6fab99fe7f89583859ecd1 (patch) | |
| tree | 34b9779e6406e44a646bd8bf65a66dc55654f51a /mail/em-event.c | |
| parent | 0c83b9b25d967ce6d6793ef851e86bc272a2f129 (diff) | |
| parent | f3abed7ac2c6099dbf5fd3e7c2483b6d75a637b5 (diff) | |
| download | gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.gz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.zst gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.zip | |
Merge branch 'master' into wip/gsettings
Conflicts:
mail/e-mail-paned-view.c
Diffstat (limited to 'mail/em-event.c')
| -rw-r--r-- | mail/em-event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mail/em-event.c b/mail/em-event.c index 7a99618727..a89069f360 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -98,7 +98,7 @@ EMEvent * em_event_peek (void) { if (em_event == NULL) { - em_event = g_object_new (em_event_get_type (), NULL); + em_event = g_object_new (EM_TYPE_EVENT, NULL); e_event_construct ( &em_event->popup, "org.gnome.evolution.mail.events"); |