Merge branch 'master' into kill-bonobo

Conflicts:
	addressbook/gui/component/addressbook-view.c
	addressbook/gui/component/component-factory.c
	addressbook/gui/component/eab-composer-util.h
	addressbook/gui/widgets/Makefile.am
	addressbook/gui/widgets/e-addressbook-model.c
	addressbook/gui/widgets/e-addressbook-view.c
	addressbook/gui/widgets/e-addressbook-view.h
	addressbook/gui/widgets/eab-gui-util.c
	addressbook/gui/widgets/eab-gui-util.h
	addressbook/gui/widgets/eab-menu.h
	addressbook/gui/widgets/eab-popup.h
	calendar/gui/calendar-component.c
	calendar/gui/e-cal-event.h
	calendar/gui/e-calendar-table.c
	calendar/gui/e-calendar-view.c
	calendar/gui/e-calendar-view.h
	calendar/gui/e-memo-table.c
	calendar/gui/memos-component.c
	calendar/gui/tasks-component.c
	composer/e-composer-header-table.c
	composer/e-composer-private.h
	composer/e-msg-composer.c
	composer/e-msg-composer.h
	composer/evolution-composer.ui
	configure.ac
	data/icons/Makefile.am
	em-format/em-format.c
	em-format/em-format.h
	mail/Makefile.am
	mail/e-mail-shell-migrate.c
	mail/e-searching-tokenizer.c
	mail/e-searching-tokenizer.h
	mail/em-composer-utils.c
	mail/em-composer-utils.h
	mail/em-folder-browser.c
	mail/em-folder-tree-model.c
	mail/em-folder-view.c
	mail/em-format-html-display.c
	mail/em-format-html-display.h
	mail/em-mailer-prefs.c
	mail/em-message-browser.c
	plugins/vcard-inline/Makefile.am
	plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
	plugins/vcard-inline/vcard-inline.c
	shell/e-component-registry.h
	shell/e-shell-window.c
	shell/es-menu.h
	widgets/misc/e-filter-bar.c
	widgets/misc/e-filter-bar.h
	widgets/misc/e-search-bar.c
	widgets/misc/e-search-bar.h

1 files changed, 2 insertions, 0 deletions

diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index e5d8478b8e..5116c7c9c9 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include "e-cal-model.h"
 #include "gnome-cal.h"
+#include "dialogs/comp-editor.h"
 
 G_BEGIN_DECLS
 
@@ -142,6 +143,7 @@ void           e_calendar_view_paste_clipboard (ECalendarView *cal_view);
 void           e_calendar_view_delete_selected_event (ECalendarView *cal_view);
 void           e_calendar_view_delete_selected_events (ECalendarView *cal_view);
 void           e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view);
+CompEditor*    e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags);
 
 GtkMenu       *e_calendar_view_create_popup_menu (ECalendarView *cal_view);