[evolution-patches] A patch for calendar based on trunk

[Kidd Wang <kidd wang sun com>]

Hi,

We find the shortcut key for resetting the end time of a selected event
doesn't work on Sun JDS and we propose to change it  from
Ctrl+Shift+Alt+Up/Down to Ctrl+Shift+Up/Down. The former also
seems too complicated. What do you think?

Regards
Kidd

Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2310
diff -u -r1.2310 ChangeLog
--- calendar/ChangeLog	7 May 2004 15:10:46 -0000	1.2310
+++ calendar/ChangeLog	8 May 2004 09:37:21 -0000
@@ -1,3 +1,11 @@
+2004-05-08  Kidd Wang  <kidd wang sun com>
+
+	* gui/e-day-view.c: (e_day_view_on_text_item_event): the shortcut
+	key for resetting the end time of a selected event is changed from
+	Ctrl+Shift+Alt+Up/Down to Ctrl+Shift+Up/Down because the former
+	results in conflicts under JDS which uses the same key to move an
+	application between workspaces.
+
 2004-05-07  JP Rosevear  <jpr ximian com>
 
 	Fixes #52294
Index: calendar/gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.244
diff -u -r1.244 e-day-view.c
--- calendar/gui/e-day-view.c	3 May 2004 13:12:33 -0000	1.244
+++ calendar/gui/e-day-view.c	8 May 2004 09:37:24 -0000
@@ -5682,14 +5682,12 @@
 			return TRUE;
                } 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_CONTROL_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_CONTROL_MASK)) {
                        e_day_view_change_event_end_time_down (day_view);
                        return TRUE;
 		}