aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-day-view.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e50d92ab05..a0aae32c6e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-06 Boby Wang <boby.wang@sun.com>
+
+ * gui/e-day-view.c: (e_day_view_on_text_item_event):
+ Change the keys which need to be pressed to alter the end time
+ of the event selected. Now: Ctrl+Shift+Up(or Down)
+ Before: Ctrl+Alt+Shift+Up(or Down) conflict with switching
+ the workspace in Gnome Desktop.
+
2006-01-05 Johnny Jacob <johnnyjacob@gmail.com>
* gui/dialogs/event-page.c (init_widgets): Set alarm-dialog as
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 3288559b11..47c466602d 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -5840,13 +5840,13 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
} else if ((event->key.keyval == GDK_Up)
&& (event->key.state & GDK_SHIFT_MASK)
&& (event->key.state & GDK_CONTROL_MASK)
- && (event->key.state & GDK_MOD1_MASK)) {
+ && !(event->key.state & GDK_MOD1_MASK)) {
e_day_view_change_event_end_time_up (day_view);
return TRUE;
} else if ((event->key.keyval == GDK_Down)
&& (event->key.state & GDK_SHIFT_MASK)
&& (event->key.state & GDK_CONTROL_MASK)
- && (event->key.state & GDK_MOD1_MASK)) {
+ && !(event->key.state & GDK_MOD1_MASK)) {
e_day_view_change_event_end_time_down (day_view);
return TRUE;
}