From 754a294a700dcc3e18056efe8dd5a8bc8d1c97e7 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 24 Aug 2005 03:06:51 +0000 Subject: de-constify uri, and fix its creation logic. (load_source_cb): cast for 2005-08-23 Not Zed * gui/component/addressbook.c (addressbook_authenticate): de-constify uri, and fix its creation logic. (load_source_cb): cast for warning. * gui/widgets/e-addressbook-view.c: more missing a11y include. * gui/widgets/e-minicard-view.c: another missing a11y include. * gui/widgets/e-minicard.c: include missing a11y include. (e_minicard_activate_editor): fix cast. * gui/widgets/eab-popup-control.c (eab_popup_control_display_contact): remove unused. * gui/widgets/eab-gui-util.c (eab_contact_save): fix conditional build. (eab_send_to_contact_and_email_num_list): fix boolean conversion. * gui/widgets/eab-contact-display.c (eab_contact_display_init): cast. * gui/contact-list-editor/e-contact-list-editor.c (fill_in_info): constify file_as. * gui/contact-editor/e-contact-editor.c (init_im_record_location): fix warnings for conditional building. (fill_in_simple_field): do proper boolean conversion. (extract_simple_field): do proper boolean conversion. (response): constify categories, and dont bother initialising it. (image_clicked): remove warnings for conditional build. (e_contact_editor_is_valid): constify text. (e_contact_editor_create_web): cast. svn path=/trunk/; revision=30216 --- addressbook/gui/component/addressbook.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index aa70808942..fad0efa48c 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -161,13 +161,11 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc char *pass_dup = NULL; const gchar *auth; const gchar *user; - const gchar *uri = e_book_get_uri (book); - gchar *stripped_uri = remove_parameters_from_uri (uri); + gchar *uri = remove_parameters_from_uri(e_book_get_uri (book)); const gchar *auth_domain = e_source_get_property (source, "auth-domain"); const gchar *component_name; component_name = auth_domain ? auth_domain : "Addressbook"; - uri = stripped_uri; password = e_passwords_get_password (component_name, uri); @@ -257,7 +255,7 @@ load_source_cb (EBook *book, EBookStatus status, gpointer closure) auth = e_source_get_property (load_source_data->source, "auth"); if (auth && strcmp (auth, "none")) { - g_signal_connect (book, "auth_required", auth_required_cb, NULL); + g_signal_connect (book, "auth_required", G_CALLBACK(auth_required_cb), NULL); if (e_book_is_online (book)) { addressbook_authenticate (book, FALSE, load_source_data->source, -- cgit