aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/e-week-view.c27
2 files changed, 11 insertions, 22 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index bfda76b284..72ee080c00 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-30 Harish Krishnaswamy <kharish@novell.com>
+
+ * gui/e-week-view.c : Reverting Chakravarthi's
+ commit on Jan 17 to fix miscellaneous problems
+ manifesting in the week/month views.
+
2006-01-30 Johnny Jacob <johnnyjacob@gmail.com>
* gui/dialogs/event-page.c: (sensitize_widgets),
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index ce6b64eae1..e1ba4b14b3 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2084,33 +2084,16 @@ e_week_view_on_button_press (GtkWidget *widget,
day = e_week_view_convert_position_to_day (week_view, x, y);
if (day == -1)
return FALSE;
-
- if (event->type == GDK_2BUTTON_PRESS) {
- GList *list;
- ECalModelComponent *comp_data;
- ECalendarViewEvent *ecalevent;
- ECalComponent *comp = e_cal_component_new ();
- gboolean is_meeting;
-
- list = e_week_view_get_selected_events (E_CALENDAR_VIEW (week_view));
- ecalevent = (ECalendarViewEvent *)list->data;
- comp_data = ecalevent->comp_data;
- e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-
- is_meeting = e_cal_component_has_attendees (comp);
- e_calendar_view_edit_appointment (E_CALENDAR_VIEW (week_view),
- comp_data->client,
- comp_data->icalcomp, is_meeting);
- g_object_unref (comp);
- g_list_free (list);
- return TRUE;
- }
-
/* If an event is pressed just return. */
if (week_view->pressed_event_num != -1)
return FALSE;
+ if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
+ e_calendar_view_new_appointment_full (E_CALENDAR_VIEW (week_view), TRUE, FALSE);
+ return TRUE;
+ }
+
if (event->button == 1) {
/* Start the selection drag. */
if (!GTK_WIDGET_HAS_FOCUS (week_view) && !GTK_WIDGET_HAS_FOCUS (week_view->main_canvas))