aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/util
Commit message (Collapse)AuthorAgeFilesLines
* Fixes bug #66369.Hans Petter Jansson2004-09-301-26/+34
| | | | | | | | | | | 2004-09-29 Hans Petter Jansson <hpj@ximian.com> Fixes bug #66369. * util/eab-book-util.c (eab_contact_list_from_string): Make the vcard splitter work with any amount of blank lines between vcards. svn path=/trunk/; revision=27429
* Merged notzed-eplugin-2-branch to head.Michael Zucci2004-09-201-0/+1
| | | | svn path=/trunk/; revision=27300
* Don't accept input that doesn't have at least a "BEGIN:VCARD" in it.Hans Petter Jansson2004-06-251-0/+7
| | | | | | | | | 2004-06-24 Hans Petter Jansson <hpj@ximian.com> * util/eab-book-util.c (eab_contact_list_from_string): Don't accept input that doesn't have at least a "BEGIN:VCARD" in it. svn path=/trunk/; revision=26505
* Add an x-source-vcard target entry that includes the source book URI.Hans Petter Jansson2004-06-242-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-06-23 Hans Petter Jansson <hpj@ximian.com> * gui/component/addressbook-view.c: Add an x-source-vcard target entry that includes the source book URI. (destroy_merge_context): Implement. (removed_contact_cb): Implement. (merged_contact_cb): Implement. (selector_tree_drag_data_received): Get the source and target books, and see if we need to remove contacts from source after they're added to target. Copy contacts sequentially, not in parallel, with a callback. * gui/widgets/e-addressbook-view.c: Add an x-source-vcard target entry that includes the source book URI. (table_drag_data_delete): Remove. This is handled by the drag target. (table_drag_data_get): Handle more than one contact. Supply source. (create_table_view): Don't connect to the delete signal. * gui/widgets/e-minicard-view.c: Add an x-source-vcard target entry that includes the source book URI. (e_minicard_view_drag_data_delete): Remove. This is handled by the drag target. (e_minicard_view_drag_data_get): Handle x-source-vcard target. (e_minicard_view_drag_begin): Don't connect to the delete signal. (e_minicard_view_dispose): Don't disconnect from the delete signal. (e_minicard_view_init): Don't init delete_id. * gui/widgets/e-minicard-view.h: Remove delete_id from struct. * util/eab-book-util.[ch] (eab_contact_list_from_string): Skip the source URI if present. (eab_book_and_contact_list_from_string): Create the source book from the provided URI, if present. (eab_book_and_contact_list_to_string): Include the book URI in generated string. svn path=/trunk/; revision=26485
* EBookContactsCallback -> EBookListCallback. (eab_nickname_query): same.Chris Toshok2004-06-182-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-06-17 Chris Toshok <toshok@ximian.com> * util/eab-book-util.c (eab_name_and_email_query): EBookContactsCallback -> EBookListCallback. (eab_nickname_query): same. * printing/e-contact-print.c: e-book-async.h -> e-book.h * gui/widgets/eab-vcard-control.c: e-book-async.h -> e-book.h. * gui/widgets/e-addressbook-model.h: e-book-async.h -> e-book.h. * gui/widgets/eab-popup-control.h: e-book-async.h -> e-book.h. * gui/widgets/eab-popup-control.c: remove e-book-async.h include. * gui/merging/eab-contact-merging.h: e-book-async.h -> e-book.h. * gui/contact-editor/e-contact-editor.h: e-book-async.h -> e-book.h. * gui/contact-editor/e-contact-editor.h: same. * gui/contact-list-editor/e-contact-list-editor.h: same. * gui/contact-list-editor/e-contact-list-model.h: remove include of e-book-async.h * gui/component/select-names/e-select-names-completion.h: include e-book.h, not e-book-async.h * gui/component/select-names/e-select-names-model.c: same. * gui/component/select-names/e-select-names.c: same. * gui/component/addressbook-migrate.c: include e-book.h, not e-book-async.h * gui/component/addressbook-view.c: same. * gui/component/addressbook.h: same. * gui/component/addressbook.c: remove include e-book-async.h. svn path=/trunk/; revision=26402
* don't use "email" twice for a variable name.. even though they don'tChris Toshok2004-05-011-3/+4
| | | | | | | | | | 2004-04-30 Chris Toshok <toshok@ximian.com> * util/e-destination.c (e_destination_set_contact): don't use "email" twice for a variable name.. even though they don't really conflict, it's ugly and confusing. svn path=/trunk/; revision=25720
* remove the e_destination_get_book api, since the function doesn't exist.Chris Toshok2004-04-111-1/+0
| | | | | | | | | 2004-04-10 Chris Toshok <toshok@ximian.com> * util/e-destination.h: remove the e_destination_get_book api, since the function doesn't exist. svn path=/trunk/; revision=25408
* use the new e_destination_export_to_vcard_attribute call to build up theChris Toshok2004-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-04-09 Chris Toshok <toshok@ximian.com> * importers/evolution-ldif-importer.c (resolve_list_card): use the new e_destination_export_to_vcard_attribute call to build up the attributes. * importers/evolution-vcard-importer.c (process_item_fn): if we're importing a vcard that we wrote out previously containing xml in the EMAIL attributes, DTRT and strip it out and use e_destination_export_to_vcard_attribute to build up the proper attribute. * util/Makefile.am (libeabutil_la_SOURCES): remove eab-destination.[ch] and add e-destination.[ch]. * printing/e-contact-print.c (e_contact_print_contact): we don't have to worry about the "<?xml..." EMAIL fields anymore. * gui/widgets/eab-gui-util.c (eab_send_contact_list): just use the value as the address (since that's what it is) in the list case. * gui/widgets/eab-contact-display.c (render_contact_list): remove the EABDestination stuff from here. (eab_contact_display_render_compact): same. * gui/widgets/e-minicard.c (activiate_editor): fix warnings - use EAB_EDITOR instead of G_OBJECT. (add_field): we don't have to worry about the "<?xml..." EMAIL fields anymore. (remodel): same. * gui/widgets/e-addressbook-treeview-adapter.c (adapter_get_value): we don't have to worry about the "<?xml..." EMAIL fields anymore. * gui/widgets/e-addressbook-table-adapter.c (addressbook_value_at): we don't have to worry about the "<?xml..." EMAIL fields anymore. * gui/contact-list-editor/e-contact-list-model.c (contact_list_value_at): eab->e. (contact_list_model_dispose): we're not a GtkObject, we're a GObject. rename _destroy to _dispose, and chain up to the parent class's ::dispose. (e_contact_list_model_class_init): GtkObject -> GObject, and destroy -> dispose. (e_contact_list_model_init): GtkObject -> GObject, and EAB -> E. (e_contact_list_model_add_destination): EAB -> E. (e_contact_list_model_add_email): same. (e_contact_list_model_add_contact): same. (e_contact_list_model_get_destination): same. * gui/contact-list-editor/e-contact-list-editor.c (table_drag_data_received_cb): add email num arg to e_contact_list_model_add_contact. (extract_info): fill in the vcard attributes instead of just generating xml. (fill_in_info): extract the values from the vcard attributes. * gui/component/select-names/e-select-names-text-model.c (e_select_names_text_model_insert_length): eab->e, and don't sometimes copy, sometimes ::new. always ::new. (e_select_names_text_model_delete): same. (e_select_names_text_model_obj_count): same. (nth_obj_index): same. * gui/component/select-names/e-select-names-table-model.c (fill_in_info): eab -> e. * gui/component/select-names/e-select-names-popup.c (make_contact_editor_cb): eab -> e. (change_email_num_cb): same. (toggle_html_mail_cb): same. (populate_popup_contact): same, and remove code that checks for <?xml, then imports the EDestination. (quick_add_cb): eab -> e. (populate_popup_nocontact): same. (e_select_names_populate_popup): same. * gui/component/select-names/e-select-names-model.h: eab -> e, and remove prototypes for nuked functions. * gui/component/select-names/e-select-names-model.c (destination_changed_proxy, send_changed, connect_destination, disconnect_destination): nuke. (e_select_names_model_duplicate): EAB -> E. (e_select_names_model_get_textification): same. (e_select_names_model_get_address_text): same. (e_select_names_model_get_destination): same. (e_select_names_model_export_destinationv): same. (send_changed): same. (e_select_names_model_import_destinationv): same. (e_select_names_model_get_contact): same. (e_select_names_model_contains): same. (e_select_names_model_insert): same, and remove call to connect_destination. (e_select_names_model_append): same. (e_select_names_model_replace): same, and remove call to disconnect/connect_destination. (e_select_names_model_delete): same. (delete_all_iter): nuke. (e_select_names_model_delete_all): use g_object_unref for the foreach call. (e_select_names_model_merge): EAB -> E. (e_select_names_model_name_pos): same. (e_select_names_model_name_pos): same. (e_select_names_model_load_all_contacts): nuke. (e_select_names_model_cancel_all_contact_load): nuke. * gui/component/select-names/e-select-names-manager.c (clean_cb, focus_in_cb, focus_out_cb, completion_popup_cb): nuke. (completion_handler): EAB -> E, and the signals are gone. * gui/component/select-names/e-select-names-completion.c: in general, s/eab_dest/e_dest and s/EABDest/EDest. (e_select_names_completion_got_book_view_cb): move the e_book_view_start to below the assignment of sequence_complete_received, just to put my mind at ease. (e_select_names_completion_stop_query): un-#if notyet the call to e_book_cancel. (e_select_names_completion_start_query): free the waiting_query before assigning to it. * gui/component/select-names/e-select-names-bonobo.c (entry_set_property_fn): remove calls to e_select_names_model_load_all_contacts, since that function is dead. * gui/component/addressbook-migrate.c (setup_progress_dialog): take the label to display to the user as an arg. (migrate_contact_lists_for_local_folders): loop over all contacts in all local addressbooks looking for ones that have <?xml in their EMAIL attributes. for the ones we find, call e_destination_export_to_vcard_attribute to build up the proper attribute. (addressbook_migrate): add in a clause for all versions under 1.5.7 to convert contact lists. also, move the unrefs of the sources/groups to outside the if, as they're created outside it. * gui/component/Makefile.am (INCLUDES): remove the addressbook/backend/ dirs, since libebook isn't there anymore (nothing is, actually). Add addressbook/util/. svn path=/trunk/; revision=25390
* use the new e_destination_export_to_vcard_attribute call to build up theChris Toshok2004-04-102-1723/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-04-09 Chris Toshok <toshok@ximian.com> * importers/evolution-ldif-importer.c (resolve_list_card): use the new e_destination_export_to_vcard_attribute call to build up the attributes. * importers/evolution-vcard-importer.c (process_item_fn): if we're importing a vcard that we wrote out previously containing xml in the EMAIL attributes, DTRT and strip it out and use e_destination_export_to_vcard_attribute to build up the proper attribute. * util/Makefile.am (libeabutil_la_SOURCES): remove eab-destination.[ch] and add e-destination.[ch]. * printing/e-contact-print.c (e_contact_print_contact): we don't have to worry about the "<?xml..." EMAIL fields anymore. * gui/widgets/eab-gui-util.c (eab_send_contact_list): just use the value as the address (since that's what it is) in the list case. * gui/widgets/eab-contact-display.c (render_contact_list): remove the EABDestination stuff from here. (eab_contact_display_render_compact): same. * gui/widgets/e-minicard.c (activiate_editor): fix warnings - use EAB_EDITOR instead of G_OBJECT. (add_field): we don't have to worry about the "<?xml..." EMAIL fields anymore. (remodel): same. * gui/widgets/e-addressbook-treeview-adapter.c (adapter_get_value): we don't have to worry about the "<?xml..." EMAIL fields anymore. * gui/widgets/e-addressbook-table-adapter.c (addressbook_value_at): we don't have to worry about the "<?xml..." EMAIL fields anymore. * gui/contact-list-editor/e-contact-list-model.c (contact_list_value_at): eab->e. (contact_list_model_dispose): we're not a GtkObject, we're a GObject. rename _destroy to _dispose, and chain up to the parent class's ::dispose. (e_contact_list_model_class_init): GtkObject -> GObject, and destroy -> dispose. (e_contact_list_model_init): GtkObject -> GObject, and EAB -> E. (e_contact_list_model_add_destination): EAB -> E. (e_contact_list_model_add_email): same. (e_contact_list_model_add_contact): same. (e_contact_list_model_get_destination): same. * gui/contact-list-editor/e-contact-list-editor.c (table_drag_data_received_cb): add email num arg to e_contact_list_model_add_contact. (extract_info): fill in the vcard attributes instead of just generating xml. (fill_in_info): extract the values from the vcard attributes. * gui/component/select-names/e-select-names-text-model.c (e_select_names_text_model_insert_length): eab->e, and don't sometimes copy, sometimes ::new. always ::new. (e_select_names_text_model_delete): same. (e_select_names_text_model_obj_count): same. (nth_obj_index): same. * gui/component/select-names/e-select-names-table-model.c (fill_in_info): eab -> e. * gui/component/select-names/e-select-names-popup.c (make_contact_editor_cb): eab -> e. (change_email_num_cb): same. (toggle_html_mail_cb): same. (populate_popup_contact): same, and remove code that checks for <?xml, then imports the EDestination. (quick_add_cb): eab -> e. (populate_popup_nocontact): same. (e_select_names_populate_popup): same. * gui/component/select-names/e-select-names-model.h: eab -> e, and remove prototypes for nuked functions. * gui/component/select-names/e-select-names-model.c (destination_changed_proxy, send_changed, connect_destination, disconnect_destination): nuke. (e_select_names_model_duplicate): EAB -> E. (e_select_names_model_get_textification): same. (e_select_names_model_get_address_text): same. (e_select_names_model_get_destination): same. (e_select_names_model_export_destinationv): same. (send_changed): same. (e_select_names_model_import_destinationv): same. (e_select_names_model_get_contact): same. (e_select_names_model_contains): same. (e_select_names_model_insert): same, and remove call to connect_destination. (e_select_names_model_append): same. (e_select_names_model_replace): same, and remove call to disconnect/connect_destination. (e_select_names_model_delete): same. (delete_all_iter): nuke. (e_select_names_model_delete_all): use g_object_unref for the foreach call. (e_select_names_model_merge): EAB -> E. (e_select_names_model_name_pos): same. (e_select_names_model_name_pos): same. (e_select_names_model_load_all_contacts): nuke. (e_select_names_model_cancel_all_contact_load): nuke. * gui/component/select-names/e-select-names-manager.c (clean_cb, focus_in_cb, focus_out_cb, completion_popup_cb): nuke. (completion_handler): EAB -> E, and the signals are gone. * gui/component/select-names/e-select-names-completion.c: in general, s/eab_dest/e_dest and s/EABDest/EDest. (e_select_names_completion_got_book_view_cb): move the e_book_view_start to below the assignment of sequence_complete_received, just to put my mind at ease. (e_select_names_completion_stop_query): un-#if notyet the call to e_book_cancel. (e_select_names_completion_start_query): free the waiting_query before assigning to it. * gui/component/select-names/e-select-names-bonobo.c (entry_set_property_fn): remove calls to e_select_names_model_load_all_contacts, since that function is dead. * gui/component/addressbook-migrate.c (setup_progress_dialog): take the label to display to the user as an arg. (migrate_contact_lists_for_local_folders): loop over all contacts in all local addressbooks looking for ones that have <?xml in their EMAIL attributes. for the ones we find, call e_destination_export_to_vcard_attribute to build up the proper attribute. (addressbook_migrate): add in a clause for all versions under 1.5.7 to convert contact lists. also, move the unrefs of the sources/groups to outside the if, as they're created outside it. * gui/component/Makefile.am (INCLUDES): remove the addressbook/backend/ dirs, since libebook isn't there anymore (nothing is, actually). Add addressbook/util/. svn path=/trunk/; revision=25389
* we don't have an EBook* anymore. (e_destination_clear): same.Chris Toshok2004-04-082-65/+51
| | | | | | | | | | | | | | | | | | | | 2004-04-07 Chris Toshok <toshok@ximian.com> * util/e-destination.c (e_destination_copy): we don't have an EBook* anymore. (e_destination_clear): same. (e_destination_set_contact): same. (e_destination_set_book): same, just cache the source_uid. (e_destination_set_book_uri): nuke. (e_destination_set_contact_uid): we don't have an EBook*. (e_destination_xml_decode): same. (e_destination_export_to_vcard_attribute): new function, fill in an EVCardAttribute with EDestination values. * util/e-destination.h: add prototype for e_destination_export_to_vcard_attribute. svn path=/trunk/; revision=25358
* old name, new trimmed down implementation. This will be replacingChris Toshok2004-04-062-0/+1396
| | | | | | | | | 2004-04-06 Chris Toshok <toshok@ximian.com> * util/e-destination.[ch]: old name, new trimmed down implementation. This will be replacing eab-destination.[ch]. svn path=/trunk/; revision=25336
* wrap this with the correct #ifdef.Chris Toshok2004-04-061-2/+2
| | | | | | | | 2004-04-05 Chris Toshok <toshok@ximian.com> * util/eab-destination.h: wrap this with the correct #ifdef. svn path=/trunk/; revision=25328
* Move unused variable declaration inside notyet conditional.Hans Petter Jansson2004-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-02-26 Hans Petter Jansson <hpj@ximian.com> * util/eab-destination.c (name_and_email_cb): Move unused variable declaration inside notyet conditional. * printing/e-contact-print.c: Include gal/util/e-util.h * gui/merging/eab-contact-compare.c (eab_contact_locate_match): Cast callback to an EBookCallback. (eab_contact_locate_match_full): Ditto. * gui/contact-editor/e-contact-quick-add.c (quick_add_set_name): Remove unused variable and cast 3rd arg to e_contact_set () (perhaps this should take a gconstpointer?). * gui/contact-editor/e-contact-editor-im.c (setup_service_optmenu): Remove unused variable. * gui/component/select-names/e-select-names.c (e_select_names_init): Cast the vbox to a GtkBox. * gui/component/addressbook-config.c (dialog_to_source): Correctly cast the spin button to a GtkSpinButton, not a GtkEntry. * gui/component/addressbook-component.c (load_primary_selection): Remove unused variable. svn path=/trunk/; revision=24898
* [ fixes #53238 ] make this accept NULL's (and return FALSE for them).Chris Toshok2004-01-271-14/+40
| | | | | | | | | | | | | | | | | | | 2004-01-26 Chris Toshok <toshok@ximian.com> [ fixes #53238 ] * util/eab-destination.c (nonempty): make this accept NULL's (and return FALSE for them). (eab_destination_is_empty): shorten some of the tests since nonempty takes NULL now. (eab_destination_get_address): only call camel_internet_address_add if both name and email are non-empty. otherwise call camel_address_decode and let camel try to deal with it. (eab_destination_xml_encode): call xmlEncodeEntitiesReentrant on the strings before adding them to the xml, so people that enter [<>&] won't end up with broken EABDestinations. svn path=/trunk/; revision=24439
* [ fixes bug #52571 ] ugh. name fields that have \" around the name breakChris Toshok2004-01-241-19/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-01-23 Chris Toshok <toshok@ximian.com> [ fixes bug #52571 ] * util/eab-book-util.c (escape): ugh. name fields that have \" around the name break our queries, because it turns it into (for instance): (contains "full_name" ""Toshok""). so we need to turn that into: (contains "full_name" "\"Toshok\""). (eab_name_and_email_query): escape both the name and email, and use an EBookQuery instead of passing the string to e_book_async_get_contacts. Looks like ross missed a couple of spots. (eab_nickname_query): same. * gui/component/addressbook.c (free_load_source_data): new function, free up the data and unref the source if there is one. (load_source_auth_cb): call free_load_source_data instead of just g_free'ing the struct. (load_source_cb): same. (default_book_cb): new function, we need this so we can fill in the source for the default book. get the source, then call load_source_cb to continue processing as normal. (addressbook_load_default_book): use default_book_cb instead of load_source_cb. svn path=/trunk/; revision=24383
* [ fixes bug #52955 ] handle the case properly where there are no queryChris Toshok2004-01-211-1/+1
| | | | | | | | | | | | | | | 2004-01-20 Chris Toshok <toshok@ximian.com> [ fixes bug #52955 ] * gui/merging/eab-contact-compare.c (use_common_book_cb): handle the case properly where there are no query parts (p == 0). Instead of passing "" to e_book_query_from_string, just set the query to NULL. * util/eab-book-util.c (eab_contact_list_to_string): we need to put a blank line here, so \r\n\r\n, not just \r\n. svn path=/trunk/; revision=24340
* Remove hard coded disable deprecated flagsJP Rosevear2003-12-071-2/+0
| | | | | | | | 2003-12-06 JP Rosevear <jpr@ximian.com> * */Makefile.am: Remove hard coded disable deprecated flags svn path=/trunk/; revision=23658
* Remove some includes of directories that don't exist any moreDan Winship2003-11-081-4/+0
| | | | | | | * util/Makefile.am (INCLUDES): Remove some includes of directories that don't exist any more svn path=/trunk/; revision=23231
* dist the marshal listJP Rosevear2003-11-071-1/+4
| | | | | | | | 2003-11-07 JP Rosevear <jpr@ximian.com> * util/Makefile.am: dist the marshal list svn path=/trunk/; revision=23210
* Various changes to merge in evolution-data-server reliance.JP Rosevear2003-11-074-10/+8
| | | | svn path=/trunk/; revision=23206
* Merge new-ui-branch to the trunk.Ettore Perazzoli2003-10-227-0/+2109
svn path=/trunk/; revision=22965