Merge commit 'EVOLUTION_2_27_5' into kill-bonobo

4 files changed, 12 insertions, 5 deletions

diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c
index a05711a7f4..eb37ae190f 100644
--- a/calendar/gui/e-cal-event.c
+++ b/calendar/gui/e-cal-event.c
@@ -47,6 +47,8 @@ ece_target_free (EEvent *ev, EEventTarget *t)
 		ECalEventTargetModule *s = (ECalEventTargetModule *) t;
 		if (s->shell_backend)
 			g_object_unref (s->shell_backend);
+		if (s->source_list)
+			g_object_unref (s->source_list);
 		break; }
 	}
 
@@ -93,11 +95,12 @@ e_cal_event_peek (void)
 }
 
 ECalEventTargetModule *
-e_cal_event_target_new_module (ECalEvent *ece, EShellBackend *shell_backend, guint32 flags)
+e_cal_event_target_new_module (ECalEvent *ece, EShellBackend *shell_backend, ESourceList *source_list, guint32 flags)
 {
 	ECalEventTargetModule *t = e_event_target_new (&ece->event, E_CAL_EVENT_TARGET_MODULE, sizeof (*t));
 
 	t->shell_backend = g_object_ref (shell_backend);
+	t->source_list = g_object_ref (source_list);
 	t->target.mask = ~flags;
 
 	return t;
diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h
index e219679f89..e9f5987673 100644
--- a/calendar/gui/e-cal-event.h
+++ b/calendar/gui/e-cal-event.h
@@ -25,6 +25,7 @@
 #define __E_CAL_EVENT_H__
 
 #include <glib-object.h>
+#include <libedataserver/e-source-list.h>
 
 #include "e-util/e-event.h"
 #include "shell/e-shell-backend.h"
@@ -48,6 +49,7 @@ typedef struct _ECalEventTargetModule ECalEventTargetModule;
 struct _ECalEventTargetModule {
 	EEventTarget target;
 	EShellBackend *shell_backend;
+	ESourceList *source_list;
 };
 
 struct _ECalEvent {
@@ -62,7 +64,7 @@ struct _ECalEventClass {
 
 GType                     e_cal_event_get_type (void);
 ECalEvent*                e_cal_event_peek (void);
-ECalEventTargetModule* e_cal_event_target_new_module (ECalEvent *ece, EShellBackend *shell_backend, guint32 flags);
+ECalEventTargetModule* e_cal_event_target_new_module (ECalEvent *ece, EShellBackend *shell_backend, ESourceList *source_list, guint32 flags);
 
 /* ********************************************************************** */
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 59138cce2c..9897354e5a 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1712,8 +1712,8 @@ static EPopupItem ecv_child_items [] = {
 	{ E_POPUP_ITEM, (gchar *) "45.delegate", (gchar *) N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING},
 	{ E_POPUP_ITEM, (gchar *) "46.schedule", (gchar *) N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING },
 	{ E_POPUP_ITEM, (gchar *) "47.forward", (gchar *) N_("_Forward as iCalendar..."), on_forward, NULL, (gchar *) "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, (gchar *) "48.reply", (gchar *) N_("_Reply"), on_reply, NULL, (gchar *) "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, (gchar *) "49.reply-all", (gchar *) N_("Reply to _All"), on_reply_all, NULL, (gchar *) "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, (gchar *) "48.reply", (gchar *) N_("_Reply"), on_reply, NULL, (gchar *) "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, (gchar *) "49.reply-all", (gchar *) N_("Reply to _All"), on_reply_all, NULL, (gchar *) "mail-reply-all", E_CAL_POPUP_SELECT_MEETING, E_CAL_POPUP_SELECT_NOTEDITING },
 
 	{ E_POPUP_BAR, (gchar *) "50." },
 
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 36a7b49ae2..2c17e4e7d1 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -734,7 +734,9 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
 	menu = gtk_menu_new ();
 
 	/* Make sure the menu is destroyed when it disappears. */
-	e_auto_kill_popup_menu_on_selection_done (GTK_MENU (menu));
+	g_signal_connect (
+		menu, "selection-done",
+		G_CALLBACK (gtk_widget_destroy), NULL);
 
 	for (i = 0; i < num_divisions; i++) {
 		g_snprintf (buffer, sizeof (buffer),