From c9f8c3ba925139249e80a251a6758351d0bff0b5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Jul 2009 17:43:02 +0200 Subject: Bug #203853 - Cut/Copy key bindings don't work in day and week views --- calendar/gui/gnome-cal.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'calendar/gui/gnome-cal.c') diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index adfcdac09f..576dfc81d2 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -766,7 +766,8 @@ get_focus_location (GnomeCalendar *gcal) if (GTK_WIDGET_HAS_FOCUS (dv->top_canvas) || GNOME_CANVAS (dv->top_canvas)->focused_item != NULL || GTK_WIDGET_HAS_FOCUS (dv->main_canvas) - || GNOME_CANVAS (dv->main_canvas)->focused_item != NULL) + || GNOME_CANVAS (dv->main_canvas)->focused_item != NULL + || GTK_WIDGET_HAS_FOCUS (dv)) return FOCUS_CALENDAR; else return FOCUS_OTHER; @@ -776,7 +777,8 @@ get_focus_location (GnomeCalendar *gcal) wv = E_WEEK_VIEW (widget); if (GTK_WIDGET_HAS_FOCUS (wv->main_canvas) - || GNOME_CANVAS (wv->main_canvas)->focused_item != NULL) + || GNOME_CANVAS (wv->main_canvas)->focused_item != NULL + || GTK_WIDGET_HAS_FOCUS (wv)) return FOCUS_CALENDAR; else return FOCUS_OTHER; @@ -784,7 +786,8 @@ get_focus_location (GnomeCalendar *gcal) case GNOME_CAL_LIST_VIEW: lv = E_CAL_LIST_VIEW (widget); - if (GTK_WIDGET_HAS_FOCUS (e_table_scrolled_get_table (lv->table_scrolled))) + if (GTK_WIDGET_HAS_FOCUS (e_table_scrolled_get_table (lv->table_scrolled)) + || GTK_WIDGET_HAS_FOCUS (lv)) return FOCUS_CALENDAR; else return FOCUS_OTHER; -- cgit v1.2.3