Bug 601767 - Delete action in calendar view has glitches

2 files changed, 12 insertions, 4 deletions

diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index d0ab20d138..42ecf3af82 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -1303,7 +1303,7 @@ static GtkActionEntry calendar_entries[] = {
 	{ "event-delete",
 	  GTK_STOCK_DELETE,
 	  NULL,
-	  NULL,
+	  "<Control>d",
 	  N_("Delete the appointment"),
 	  G_CALLBACK (action_event_delete_cb) },
 
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 7c4cdbf9c0..a2fa491cc3 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -225,17 +225,20 @@ static void
 cal_shell_view_popup_event_cb (EShellView *shell_view,
                                GdkEventButton *event)
 {
-	const gchar *widget_path;
 	GList *list;
-	gint n_selected;
 	GnomeCalendar *calendar;
+	GnomeCalendarViewType view_type;
 	ECalendarView *view;
 	ECalShellViewPrivate *priv;
+	const gchar *widget_path;
+	gint n_selected;
 
 	priv = E_CAL_SHELL_VIEW_GET_PRIVATE (shell_view);
 
 	calendar = e_cal_shell_content_get_calendar (priv->cal_shell_content);
-	view = gnome_calendar_get_calendar_view (calendar, gnome_calendar_get_view (calendar));
+
+	view_type = gnome_calendar_get_view (calendar);
+	view = gnome_calendar_get_calendar_view (calendar, view_type);
 
 	list = e_calendar_view_get_selected_events (view);
 	n_selected = g_list_length (list);
@@ -488,6 +491,11 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 			cal_shell_view);
 
 		g_signal_connect_swapped (
+			calendar_view, "selection-changed",
+			G_CALLBACK (e_shell_view_update_actions),
+			cal_shell_view);
+
+		g_signal_connect_swapped (
 			calendar_view, "user-created",
 			G_CALLBACK (cal_shell_view_user_created_cb),
 			cal_shell_view);