From 5c85a8211ecc53c48666a9180787659f88a8fea8 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 10 Jul 2001 01:31:29 +0000 Subject: Use e_utf8_from_gtk_event_key() so that we can input utf8 text properly. 2001-07-09 Federico Mena Quintero * gui/e-day-view.c (e_day_view_key_press): Use e_utf8_from_gtk_event_key() so that we can input utf8 text properly. (e_day_view_cut_clipboard): Constify. (e_day_view_on_cut): Constify. (e_day_view_reshape_long_event): Remove unused variable. * gui/e-week-view.c (e_week_view_key_press): Use e_utf8_from_gtk_event_key() so that we can input utf8 text properly. (e_week_view_cut_clipboard): Constify. (e_week_view_on_cut): Constify. * cal-client/cal-client.c (cal_client_resolve_tzid_cb): Fix the prototype so that this matches CalRecurResolveTimezoneFn. Also renamed it so that it is clear that it is supposed to be a callback. svn path=/trunk/; revision=10942 --- calendar/cal-client/cal-client.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'calendar/cal-client/cal-client.c') diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 6bef9508b3..8acbbc376a 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -912,11 +912,17 @@ cal_client_get_timezone (CalClient *client, /* Resolves TZIDs for the recurrence generator. */ icaltimezone* -cal_client_resolve_tzid (const char *tzid, CalClient *client) +cal_client_resolve_tzid_cb (const char *tzid, gpointer data) { + CalClient *client; icaltimezone *zone = NULL; CalClientGetStatus status; + g_return_val_if_fail (data != NULL, NULL); + g_return_val_if_fail (IS_CAL_CLIENT (data), NULL); + + client = CAL_CLIENT (data); + /* FIXME: Handle errors. */ status = cal_client_get_timezone (client, tzid, &zone); @@ -1430,7 +1436,8 @@ cal_client_generate_instances (CalClient *client, CalObjType type, CalComponent *comp; comp = l->data; - cal_recur_generate_instances (comp, start, end, add_instance, &instances, (CalRecurResolveTimezoneFn) cal_client_resolve_tzid, client); + cal_recur_generate_instances (comp, start, end, add_instance, &instances, + cal_client_resolve_tzid_cb, client); gtk_object_unref (GTK_OBJECT (comp)); } -- cgit v1.2.3