aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@ximian.com>2001-07-01 06:10:26 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2001-07-01 06:10:26 +0800
commit9ae6fb2f6c95736a4faa9c388e041dd3687be3c6 (patch)
treec20d3fac25f055549ed06d39a4fa85d9659b5a24
parent4eb33d8180409c244b3f774d15556da2c3c519db (diff)
downloadgsoc2013-evolution-9ae6fb2f6c95736a4faa9c388e041dd3687be3c6.tar
gsoc2013-evolution-9ae6fb2f6c95736a4faa9c388e041dd3687be3c6.tar.gz
gsoc2013-evolution-9ae6fb2f6c95736a4faa9c388e041dd3687be3c6.tar.bz2
gsoc2013-evolution-9ae6fb2f6c95736a4faa9c388e041dd3687be3c6.tar.lz
gsoc2013-evolution-9ae6fb2f6c95736a4faa9c388e041dd3687be3c6.tar.xz
gsoc2013-evolution-9ae6fb2f6c95736a4faa9c388e041dd3687be3c6.tar.zst
gsoc2013-evolution-9ae6fb2f6c95736a4faa9c388e041dd3687be3c6.zip
Only set the pressed_event_num and pressed_span_num if button 1 was
2001-06-30 Federico Mena Quintero <federico@ximian.com> * gui/e-week-view-event-item.c (e_week_view_event_item_button_press): Only set the pressed_event_num and pressed_span_num if button 1 was pressed. Fix up return values a bit. This fixes bug #3780. svn path=/trunk/; revision=10637
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/e-week-view-event-item.c12
2 files changed, 13 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c07d45c647..1a75c62023 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,10 @@
2001-06-30 Federico Mena Quintero <federico@ximian.com>
+ * gui/e-week-view-event-item.c
+ (e_week_view_event_item_button_press): Only set the
+ pressed_event_num and pressed_span_num if button 1 was pressed.
+ Fix up return values a bit. This fixes bug #3780.
+
* gui/gnome-cal.c
(gnome_calendar_on_date_navigator_selection_changed): Doh, the
call for the day view was supposed to be
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index c3f0c2c816..ec0d5b8795 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -716,10 +716,10 @@ e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
if (pos == E_WEEK_VIEW_POS_NONE)
return FALSE;
- week_view->pressed_event_num = wveitem->event_num;
- week_view->pressed_span_num = wveitem->span_num;
-
if (bevent->button.button == 1) {
+ week_view->pressed_event_num = wveitem->event_num;
+ week_view->pressed_span_num = wveitem->span_num;
+
/* Ignore clicks on the event while editing. */
if (E_TEXT (span->text_item)->editing)
return FALSE;
@@ -731,6 +731,8 @@ e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
/* FIXME: Remember the day offset from the start of the event.
*/
+
+ return TRUE;
} else if (bevent->button.button == 3) {
if (!GTK_WIDGET_HAS_FOCUS (week_view))
gtk_widget_grab_focus (GTK_WIDGET (week_view));
@@ -739,9 +741,11 @@ e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
wveitem->event_num);
gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
"button_press_event");
+
+ return TRUE;
}
- return TRUE;
+ return FALSE;
}