diff options
5 files changed, 19 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index a6cd61cacb..d698dd65f5 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,17 @@ +2001-05-20 Christopher James Lahey <clahey@ximian.com> + + * gui/component/addressbook-config.c + (addressbook_source_item_new): Removed an unused variable. + + * gui/component/select-names/e-select-names-bonobo.c + (entry_get_property_fn): Made text here non-const. + + * gui/component/select-names/e-select-names-popup.c + (edit_contact_info_cb): Cast to a gpointer here. + + * gui/component/select-names/e-select-names.c + (e_addressbook_create_ebook_table): Cast to E_TABLE_MODEL here. + 2001-05-18 Jon Trowbridge <trow@ximian.com> * gui/component/select-names/e-select-names-completion.c diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 08fff54cb6..d23fb1ced2 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -378,7 +378,9 @@ addressbook_source_item_new (AddressbookSourceDialog *dialog, AddressbookSourceT { AddressbookSourcePageItem *item = g_new0 (AddressbookSourcePageItem, 1); GtkWidget *table = NULL; +#if 0 GtkWidget *advanced_button; +#endif int row = 0; item->pnum = type; diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c index 18f88c7f5a..7c22889158 100644 --- a/addressbook/gui/component/select-names/e-select-names-bonobo.c +++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c @@ -66,7 +66,7 @@ entry_get_property_fn (BonoboPropertyBag *bag, void *user_data) { GtkWidget *w; - const char *text; + char *text; w = GTK_WIDGET (user_data); diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c index 4f40093901..e31fa8506f 100644 --- a/addressbook/gui/component/select-names/e-select-names-popup.c +++ b/addressbook/gui/component/select-names/e-select-names-popup.c @@ -121,7 +121,7 @@ edit_contact_info_cb (GtkWidget *w, gpointer user_data) return; gtk_object_ref (GTK_OBJECT (info->dest)); - e_book_use_local_address_book (edit_contact_info_have_book_cb, info->dest); + e_book_use_local_address_book (edit_contact_info_have_book_cb, (gpointer) info->dest); } static void diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index b2468402c8..cfb88109f2 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -179,7 +179,7 @@ e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int n char *uri; char *spec; - model = e_addressbook_model_new(); + model = E_TABLE_MODEL (e_addressbook_model_new()); gtk_object_set(GTK_OBJECT(model), "editable", FALSE, "query", "(contains \"email\" \"\")", |