aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-06-16 03:17:15 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-06-16 03:17:15 +0800
commitdb8047d94763472665119c566b68338175e12e81 (patch)
tree6ca2cbe9ac430942143190676614f8f5b8c50487 /calendar
parentfbfb3ab6a922120b28fb0c0463fd072104fbdd8b (diff)
downloadgsoc2013-evolution-db8047d94763472665119c566b68338175e12e81.tar
gsoc2013-evolution-db8047d94763472665119c566b68338175e12e81.tar.gz
gsoc2013-evolution-db8047d94763472665119c566b68338175e12e81.tar.bz2
gsoc2013-evolution-db8047d94763472665119c566b68338175e12e81.tar.lz
gsoc2013-evolution-db8047d94763472665119c566b68338175e12e81.tar.xz
gsoc2013-evolution-db8047d94763472665119c566b68338175e12e81.tar.zst
gsoc2013-evolution-db8047d94763472665119c566b68338175e12e81.zip
Fixes #59401
2004-06-15 JP Rosevear <jpr@novell.com> Fixes #59401 * gui/e-week-view.c (e_week_view_on_text_item_event): if we are editing the event, don't ignore the right click, stop editing the event and continue on svn path=/trunk/; revision=26353
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-week-view.c5
2 files changed, 12 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f413ebf401..8f3fa0df05 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
2004-06-15 JP Rosevear <jpr@novell.com>
+ Fixes #59401
+
+ * gui/e-week-view.c (e_week_view_on_text_item_event): if we are
+ editing the event, don't ignore the right click, stop editing the
+ event and continue on
+
+2004-06-15 JP Rosevear <jpr@novell.com>
+
Fixes #57393
* gui/e-week-view.c (e_week_view_set_compress_weekend): redraw the
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index fc1164df7f..7affe611b6 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2980,9 +2980,12 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
&event_num, &span_num))
return FALSE;
- if (gdkevent->button.button == 3 && !E_TEXT (item)->editing) {
+ if (gdkevent->button.button == 3) {
EWeekViewEvent *e;
+ if (E_TEXT (item)->editing)
+ e_week_view_stop_editing_event (week_view);
+
e = &g_array_index (week_view->events, EWeekViewEvent, event_num);
if (!GTK_WIDGET_HAS_FOCUS (week_view))