diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2001-07-10 09:31:29 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2001-07-10 09:31:29 +0800 |
| commit | 5c85a8211ecc53c48666a9180787659f88a8fea8 (patch) | |
| tree | af4d6323ee921642f213cc1ff18653a49ad40254 /calendar/cal-client | |
| parent | 8feacdf535a9a25c961dfbf81c5b1f2ec3962174 (diff) | |
| download | gsoc2013-evolution-5c85a8211ecc53c48666a9180787659f88a8fea8.tar.gz gsoc2013-evolution-5c85a8211ecc53c48666a9180787659f88a8fea8.tar.zst gsoc2013-evolution-5c85a8211ecc53c48666a9180787659f88a8fea8.zip | |
Use e_utf8_from_gtk_event_key() so that we can input utf8 text properly.
2001-07-09 Federico Mena Quintero <federico@ximian.com>
* 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
Diffstat (limited to 'calendar/cal-client')
| -rw-r--r-- | calendar/cal-client/cal-client.c | 11 | ||||
| -rw-r--r-- | calendar/cal-client/cal-client.h | 2 |
2 files changed, 10 insertions, 3 deletions
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)); } diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h index 72619074d2..12d04b70d4 100644 --- a/calendar/cal-client/cal-client.h +++ b/calendar/cal-client/cal-client.h @@ -142,7 +142,7 @@ gboolean cal_client_remove_object (CalClient *client, const char *uid); CalQuery *cal_client_get_query (CalClient *client, const char *sexp); /* Resolves TZIDs for the recurrence generator. */ -icaltimezone *cal_client_resolve_tzid (const char *tzid, CalClient *client); +icaltimezone *cal_client_resolve_tzid_cb (const char *tzid, gpointer data); |