diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-08-10 17:37:40 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-08-10 17:37:40 +0800 |
| commit | 92a2ca0066a646bdf22d2eb55a03e45415f60ac9 (patch) | |
| tree | ee47cbeb09b5c9a3aa6e1eff2f4808a2042e02ff /calendar | |
| parent | 43917f0a6deadef5dbd4c37bec8c7b245c22ce61 (diff) | |
| download | gsoc2013-evolution-92a2ca0066a646bdf22d2eb55a03e45415f60ac9.tar gsoc2013-evolution-92a2ca0066a646bdf22d2eb55a03e45415f60ac9.tar.gz gsoc2013-evolution-92a2ca0066a646bdf22d2eb55a03e45415f60ac9.tar.bz2 gsoc2013-evolution-92a2ca0066a646bdf22d2eb55a03e45415f60ac9.tar.lz gsoc2013-evolution-92a2ca0066a646bdf22d2eb55a03e45415f60ac9.tar.xz gsoc2013-evolution-92a2ca0066a646bdf22d2eb55a03e45415f60ac9.tar.zst gsoc2013-evolution-92a2ca0066a646bdf22d2eb55a03e45415f60ac9.zip | |
Bug #676785 - Enables wrong calendar after saving appointment
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 11 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.h | 6 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index fb82854de3..795aacabc4 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -943,8 +943,8 @@ e_calendar_view_class_init (ECalendarViewClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECalendarViewClass, user_created), NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, G_TYPE_OBJECT); signals[OPEN_EVENT] = g_signal_new ( "open-event", @@ -1677,7 +1677,7 @@ static void object_created_cb (CompEditor *ce, ECalendarView *cal_view) { - e_calendar_view_emit_user_created (cal_view); + e_calendar_view_emit_user_created (cal_view, comp_editor_get_client (ce)); } CompEditor * @@ -2180,11 +2180,12 @@ e_calendar_view_get_icalcomponent_summary (ECalClient *client, } void -e_calendar_view_emit_user_created (ECalendarView *cal_view) +e_calendar_view_emit_user_created (ECalendarView *cal_view, + ECalClient *where_was_created) { g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - g_signal_emit (cal_view, signals[USER_CREATED], 0); + g_signal_emit (cal_view, signals[USER_CREATED], 0, where_was_created); } void diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 219305dceb..ab4d4e3778 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -143,7 +143,8 @@ struct _ECalendarViewClass { ECalendarViewEvent *event); void (*event_added) (ECalendarView *day_view, ECalendarViewEvent *event); - void (*user_created) (ECalendarView *cal_view); + void (*user_created) (ECalendarView *cal_view, + ECalClient *where_was_created); /* Virtual methods */ GList * (*get_selected_events) (ECalendarView *cal_view); @@ -261,7 +262,8 @@ const gchar * e_calendar_view_get_icalcomponent_summary gboolean *free_text); void e_calendar_view_emit_user_created - (ECalendarView *cal_view); + (ECalendarView *cal_view, + ECalClient *where_was_created); void draw_curved_rectangle (cairo_t *cr, gdouble x0, diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index c2b7fc78fd..2b935f3f3a 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -6898,7 +6898,7 @@ e_day_view_on_editing_stopped (EDayView *day_view, } else { icalcomponent_set_uid (icalcomp, uid); e_calendar_view_emit_user_created ( - E_CALENDAR_VIEW (day_view)); + E_CALENDAR_VIEW (day_view), client); } g_free (uid); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 613ab9e5b9..4810f0c82d 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -4056,7 +4056,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, icalcomponent_set_uid (icalcomp, uid); e_calendar_view_emit_user_created ( - E_CALENDAR_VIEW (week_view)); + E_CALENDAR_VIEW (week_view), client); } if (uid) |