diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-04-22 00:06:38 +0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-04-22 00:06:38 +0800 |
| commit | a84b1a325147e6321b90f491a1dc686e588869dc (patch) | |
| tree | 409a66488e99ed288c9ff2b4eb90f1993ae537ab /calendar/gui/e-day-view.c | |
| parent | e9c4388490925de25b029fa0d6437a34a6386c05 (diff) | |
| parent | ece7dcdcea82d0e1fbc104cf48b2928a449b8748 (diff) | |
| download | gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.gz gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.zst gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.zip | |
Merge commit 'origin/gnome-2-30' into express2
Diffstat (limited to 'calendar/gui/e-day-view.c')
| -rw-r--r-- | calendar/gui/e-day-view.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index cbc71b969c..cc8581fb00 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -948,12 +948,13 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data) } static void -timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone, +timezone_changed_cb (ECalModel *cal_model, icaltimezone *old_zone, icaltimezone *new_zone, gpointer user_data) { struct icaltimetype tt; time_t lower; - EDayView *day_view = (EDayView *) cal_view; + EDayView *day_view = (EDayView *) user_data; + ECalendarView *cal_view = (ECalendarView *) day_view; g_return_if_fail (E_IS_DAY_VIEW (day_view)); @@ -1294,10 +1295,6 @@ e_day_view_init (EDayView *day_view) GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK); e_drag_dest_add_calendar_targets (day_view->main_canvas); - - /* connect to ECalendarView's signals */ - g_signal_connect (G_OBJECT (day_view), "timezone_changed", - G_CALLBACK (timezone_changed_cb), NULL); } static void @@ -1314,6 +1311,8 @@ init_model (EDayView *day_view, ECalModel *model) G_CALLBACK (model_rows_inserted_cb), day_view); g_signal_connect (G_OBJECT (model), "comps_deleted", G_CALLBACK (model_comps_deleted_cb), day_view); + g_signal_connect (G_OBJECT (model), "timezone_changed", + G_CALLBACK (timezone_changed_cb), day_view); } /* Turn off the background of the canvas windows. This reduces flicker |