From c5152171a104a8607952c07bfd99d434970eb80a Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Thu, 23 Jan 2003 21:56:10 +0000 Subject: Fixes some trivial, but distracting, warnings. 2003-01-23 Hans Petter Jansson Fixes some trivial, but distracting, warnings. * gui/calendar-config.c (on_timezone_set): Fix constness. * gui/e-timezone-entry.c (on_button_clicked): Fix constness. * gui/dialogs/event-page.c (contacts_changed_cb): Fix constness. * gui/dialogs/task-page.c (contacts_changed_cb): Fix constness. * gui/e-itip-control.c (start_default_server): Cast callback with G_CALLBACK (). * gui/dialogs/schedule-page.c (init_widgets): Cast callback with G_CALLBACK (). * gui/calendar-offline-handler.c (impl_dispose): Takes GObject, not GtkObject. (impl_finalize): Ditto. * gui/calendar-view.c (calendar_view_edit): Now takes parent window as second arg. * gui/e-meeting-model.c (select_names_ok_cb): Fix constness. (get_select_name_dialog): Cast callback to BonoboListenerCallbackFn. * gui/e-meeting-time-sel.c (e_meeting_time_selector_options_menu_position_callback): Add the push_in arg to arg list. This was crash-prone before. (e_meeting_time_selector_autopick_menu_position_callback): Ditto. * gui/alarm-notify/alarm-notify-dialog.c: Include e-unicode.h. svn path=/trunk/; revision=19605 --- calendar/gui/e-timezone-entry.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'calendar/gui/e-timezone-entry.c') diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 5365820dcf..8f85cbff2e 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -199,17 +199,20 @@ on_button_clicked (GtkWidget *widget, ETimezoneEntryPrivate *priv; ETimezoneDialog *timezone_dialog; GtkWidget *dialog; - char *tzid = NULL, *display_name, *old_display_name; + char *tzid = NULL; + const gchar *old_display_name; + const gchar *display_name; priv = tentry->priv; - display_name = gtk_entry_get_text (GTK_ENTRY (priv->entry)); if (priv->zone) tzid = icaltimezone_get_tzid (priv->zone); timezone_dialog = e_timezone_dialog_new (); - e_timezone_dialog_set_timezone (timezone_dialog, tzid, display_name); + + /* e_timezone_dialog_set_timezone() should really take (const gchar *) */ + e_timezone_dialog_set_timezone (timezone_dialog, tzid, (gchar *) display_name); dialog = e_timezone_dialog_get_toplevel (timezone_dialog); @@ -245,7 +248,7 @@ icaltimezone* e_timezone_entry_get_timezone (ETimezoneEntry *tentry) { ETimezoneEntryPrivate *priv; - char *display_name; + const char *display_name; g_return_val_if_fail (E_IS_TIMEZONE_ENTRY (tentry), NULL); -- cgit v1.2.3