diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 8 | ||||
| -rw-r--r-- | calendar/gui/tasks-control.c | 1 |
4 files changed, 12 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index c689008374..eb3ed1a71a 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2007-03-29 Matthew Barnes <mbarnes@redhat.com> + + * gui/e-day-view.c: + * gui/e-week-view.c: + * gui/tasks-control.c: + Fix "incompatible pointer type" warnings (#360619). + 2007-03-27 Matthew Barnes <mbarnes@redhat.com> * gui/alarm-notify/alarm-queue.c: diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 4a31780d61..07f11c40b2 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -7158,7 +7158,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item, data->cal_view = (ECalendarView *)day_view; data->day = day; data->event_num = event_num; - data->get_view_event = tooltip_get_view_event; + data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event; pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data); return TRUE; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index b9da861609..02250ed228 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -2128,7 +2128,7 @@ e_week_view_on_scroll (GtkWidget *widget, GtkWidget *tool_window = g_object_get_data (G_OBJECT (week_view), "tooltip-window"); guint timeout; - timeout = GPOINTER_TO_UINT (g_object_get_data (week_view, "tooltip-timeout")); + timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (week_view), "tooltip-timeout")); if (timeout) { g_source_remove (timeout); g_object_set_data (G_OBJECT (week_view), "tooltip-timeout", NULL); @@ -2549,7 +2549,7 @@ tooltip_destroy (EWeekView *week_view, GnomeCanvasItem *item) EWeekViewEvent *pevent; guint timeout; - timeout = GPOINTER_TO_UINT (g_object_get_data (week_view, "tooltip-timeout")); + timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (week_view), "tooltip-timeout")); if (timeout) { g_source_remove (timeout); g_object_set_data (G_OBJECT (week_view), "tooltip-timeout", NULL); @@ -2590,7 +2590,7 @@ tooltip_event_cb (GnomeCanvasItem *item, data->cal_view = (ECalendarView *)view; data->day = -1; data->event_num = event_num; - data->get_view_event = tooltip_get_view_event; + data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event; pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data); g_object_set_data ((GObject *)view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout)); @@ -3163,7 +3163,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, data->cal_view = (ECalendarView *)week_view; data->day = -1; data->event_num = nevent; - data->get_view_event = tooltip_get_view_event; + data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event; pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data); g_object_set_data ((GObject *)week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout)); diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index e81fd85d93..2393c8fd8b 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -252,7 +252,6 @@ static BonoboUIVerb verbs [] = { BONOBO_UI_VERB ("TasksPrintPreview", tasks_control_print_preview_cmd), BONOBO_UI_VERB ("TasksAssign", tasks_control_assign_cmd), BONOBO_UI_VERB ("TasksForward", tasks_control_forward_cmd), - BONOBO_UI_VERB ("ViewPreview", tasks_control_view_preview), BONOBO_UI_VERB_END }; |