aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/merging
Commit message (Collapse)AuthorAgeFilesLines
* ** Remove trailing whitespace from source code.Matthew Barnes2007-11-153-44/+44
| | | | | | | | | 2007-11-14 Matthew Barnes <mbarnes@redhat.com> ** Remove trailing whitespace from source code. svn path=/trunk/; revision=34537
* Warning fixes: - mixing code and declarations - NULL vs 0 vs FALSE/TRUE -Kjartan Maraas2007-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2007-10-23 Kjartan Maraas <kmaraas@gnome.org> * gui/contact-editor/e-contact-editor-address.c: * gui/contact-editor/e-contact-editor-fullname.c: * gui/contact-editor/e-contact-editor-im.c: * gui/contact-editor/e-contact-editor.c: (save_contact), (app_delete_event_cb), (e_contact_editor_set_property), (e_contact_editor_create_date): * gui/contact-list-editor/e-contact-list-model.c: (e_contact_list_model_new): * gui/merging/eab-contact-merging.c: (mergeit), (response): * gui/widgets/e-minicard.c: (e_minicard_event), (add_field), (get_email_location), (add_email_field), (remodel), (e_minicard_reflow), (e_minicard_compare): * gui/widgets/eab-config.c: (eab_config_new): * gui/widgets/eab-gui-util.c: (eab_load_error_dialog), (file_exists), (save_it), (contact_added_cb), (eab_send_to_contact_and_email_num_list): * gui/widgets/eab-menu.c: (eab_menu_new): * gui/widgets/eab-popup.c: (eab_popup_new): * importers/evolution-csv-importer.c: (parseLine), (getNextCSVEntry): * printing/e-contact-print-style-editor.c: * printing/test-contact-print-style-editor.c: * printing/test-print.c: * util/eab-book-util.c: (eab_get_config_database): Warning fixes: - mixing code and declarations - NULL vs 0 vs FALSE/TRUE - mark code static - some coding style fixes - if vs ifdef - Remove some unused bits - ANSIfication of declarations svn path=/trunk/; revision=34421
* 2007-09-07 mcrha Fix for bug #473903Milan Crha2007-09-071-1/+1
| | | | svn path=/trunk/; revision=34192
* Update FSF address in header comments (#469886). Patch from TobiasMatthew Barnes2007-09-022-2/+2
| | | | | | | | | | 2007-09-02 Matthew Barnes <mbarnes@redhat.com> * Update FSF address in header comments (#469886). Patch from Tobias Mueller. svn path=/trunk/; revision=34151
* Committed on behalf of Ushveen Kaur <kushveen@novell.com>Johnny Jacob2007-08-271-2/+1
| | | | | | | | | Committed on behalf of Ushveen Kaur <kushveen@novell.com> ** Fixes bug #352358 svn path=/trunk/; revision=34109
* 2007-08-24 Suman Manjunath Fix for bug #440328Milan Crha2007-08-242-2/+3
| | | | svn path=/trunk/; revision=34093
* ** Fix for bug #455799Hiroyuki Ikezoe2007-08-041-8/+0
| | | | | | | | | | | | 2007-08-04 Hiroyuki Ikezoe <poincare@ikezoe.net> ** Fix for bug #455799 Remove all .cvsignore and update svn:ignore porperty in whole directories. svn path=/trunk/; revision=33945
* ** Fix for bug #325882Srinivasa Ragavan2007-06-181-1/+1
| | | | svn path=/trunk/; revision=33694
* Fix compiler warnings in addressbook folder. (#440272)Matthew Barnes2007-06-031-21/+24
| | | | svn path=/trunk/; revision=33630
* Committing Contact Merging patch from Ebby WiselynSrinivasa Ragavan2007-04-182-6/+299
| | | | svn path=/trunk/; revision=33428
* Fix for Bug 336713Devashish Sharma2006-04-211-4/+2
| | | | svn path=/trunk/; revision=31847
* reviewed by: Harish Krishnaswamy <kharish@novell.com>Kjartan Maraas2006-01-271-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2006-01-27 Kjartan Maraas <kmaraas@gnome.org> reviewed by: Harish Krishnaswamy <kharish@novell.com> * gui/component/addressbook-component.c: (impl_requestCreateItem): Remove unused bits. * gui/component/addressbook-config.c: (eabc_general_type), (eabc_general_offline): Same here. * gui/component/addressbook-migrate.c: Remove unused static function. * gui/component/addressbook-view.c: (selector_tree_drag_motion): Remove unused static function and init uninitialized var. * gui/contact-editor/e-contact-editor-address.c: (fill_in_countries): Return early if setlocale() fails. * gui/contact-editor/e-contact-editor.c: (file_as_get_style), (extract_email), (extract_phone), (sensitize_phone_types), (extract_im), (sensitize_im_types), (init_simple): Mark some arrays static, remove unused variables, fix gcc warnings * gui/contact-list-editor/e-contact-list-editor.c: (fill_in_info): Remove unused var. * gui/merging/eab-contact-compare.c: (eab_contact_compare_name): Remove unused static function and unused vars. * gui/search/e-addressbook-search-dialog.c: (eab_search_dialog_dispose): Remove unused vars. * gui/widgets/e-addressbook-model.c: (get_view): Add comment. * gui/widgets/e-addressbook-view.c: (eab_view_class_init), (eab_view_delete_selection): Remove unused var * gui/widgets/e-addressbook-view.h: Remove extra semi-colon. * gui/widgets/e-minicard-label.c: (e_minicard_label_unrealize): Remove unused var. * gui/widgets/e-minicard.c: (e_minicard_unrealize), (e_minicard_event), (add_field), (remodel), (e_minicard_reflow): Remove unused vars. s/if/ifdef in some places, use passed in parameter instead of redeclaring the thing locally. * gui/widgets/eab-contact-display.c: (accum_address), (eab_contact_display_render_compact): s/if/ifdef. * gui/widgets/eab-gui-util.c: (eab_select_source): Comment out unused var. * gui/widgets/eab-popup-control.c: (eab_popup_control_cleanup): s/if/ifdef * printing/e-contact-print-style-editor.c: (e_contact_print_style_editor_class_init), (e_contact_print_style_editor_set_arg), (e_contact_print_style_editor_get_arg): Remove unused vars. * util/eab-book-util.c: s/if/ifdef svn path=/trunk/; revision=31327
* gui/contact-editor/e-contact-editor.cTor Lillqvist2005-11-261-5/+15
| | | | | | | | | | | | | | | | | | | | | 2005-11-26 Tor Lillqvist <tml@novell.com> * gui/contact-editor/e-contact-editor.c * gui/contact-editor/e-contact-editor-address.c * gui/contact-editor/e-contact-editor-fullname.c * gui/contact-editor/e-contact-editor-im.c * gui/contact-list-editor/e-contact-list-editor.c * gui/merging/eab-contact-merging.c * gui/widgets/e-addressbook-view.c * printing/e-contact-print.c * printing/e-contact-print-style-editor.c: Include e-util-private.h to get redefinition of compile-time pathnames as calls to functions on Windows. Construct the pathnames of files and directories under the installation prefix at run-time to enable install-anywhere on Windows. No effect on functionality on Unix. svn path=/trunk/; revision=30678
* Not allowing partial comparisons while finding duplicate entries.Sushma Rai2005-09-301-1/+1
| | | | | | Fixes #315034. Patch submitted by "Devashish Sharma <sdevashish@novell.com>". svn path=/trunk/; revision=30443
* Fixed the problem of comparison and never returning true, inSushma Rai2005-08-221-3/+4
| | | | | | match_email_hostname(). svn path=/trunk/; revision=30186
* Not checking for the duplicate contacts matching emial ids of a list.Sushma Rai2005-08-171-34/+38
| | | | | | skip email comparison in case of contact lists. Fixes #312554. svn path=/trunk/; revision=30146
* While adding new contact, during the duplicate contact check, not comparingSushma Rai2005-08-171-1/+2
| | | | | | the email id of new contact with the email ids of contact lists. svn path=/trunk/; revision=30145
* Handling GTK_RESPONSE_DELETE_EVENT response.Sushma Rai2005-08-171-0/+3
| | | | svn path=/trunk/; revision=30144
* Added scroll bar to duplicate detected dialog.Sushma Rai2005-08-171-138/+151
| | | | svn path=/trunk/; revision=30143
* gui/component/Makefile.am gui/contact-editor/Makefile.amTor Lillqvist2005-06-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2005-06-18 Tor Lillqvist <tml@novell.com> * gui/component/Makefile.am * gui/contact-editor/Makefile.am * gui/contact-list-editor/Makefile.am * gui/merging/Makefile.am * gui/search/Makefile.am * gui/widgets/Makefile.am: Prune unnecessary and nonexistent directories from the -I options. Prune pathname macros not used in the sources in that directory from the -D options. * gui/component/Makefile.am * gui/contact-editor/Makefile.am * gui/contact-list-editor/Makefile.am * util/Makefile.am: Use NO_UNDEFINED. Link with all necessary libraries. * gui/component/Makefile.am: Use Win32-specific hack to work around MSYS feature in the gconftool invocation. * gui/contact-editor/Makefile.am * gui/contact-list-editor/Makefile.am: Use bootstrap library libevolution-addressbook on Win32. * gui/contact-editor/Makefile.am * gui/contact-list-editor/Makefile.am * util/Makefile.am: Use privsolib_LTLIBRARIES instead of privlib_LTLIBRARIES (see ../ChangeLog). svn path=/trunk/; revision=29546
* Fix some spacing and remove the separator for HIG compliance Set properRodney Dawes2005-01-222-5/+21
| | | | | | | | | | | | | 2005-01-21 Rodney Dawes <dobey@novell.com> * gui/merging/eab-contact-duplicate-detected.glade: Fix some spacing and remove the separator for HIG compliance * gui/merging/eab-contact-merging.c (match_query_callback): Set proper border widths on some dialog containers for the HIG Fixes #41228 svn path=/trunk/; revision=28497
* Fixes bug #65537.Hans Petter Jansson2004-09-301-2/+13
| | | | | | | | | | | 2004-09-29 Hans Petter Jansson <hpj@ximian.com> Fixes bug #65537. * gui/merging/eab-contact-compare.c (query_cb): Protect against NULL UIDs, and make fewer calls to e_contact_get_const () as a bonus. svn path=/trunk/; revision=27428
* [ patch for the rest of 60889 ] new function, either start up the query orChris Toshok2004-08-271-7/+50
| | | | | | | | | | | | | | | | | | | | 2004-08-26 Chris Toshok <toshok@ximian.com> [ patch for the rest of 60889 ] * gui/merging/eab-contact-merging.c (add_lookup): new function, either start up the query or add it to the queue if we're over the number of simultaneous queries. (finished_lookup): start up enough pending queries to get us to our limit again. (free_lookup): free lookup->avoid. (final_id_cb): call finished_lookup. (eab_merging_book_add_contact): set lookup->avoid to NULL and replace call to eab_contact_locate_match_full with add_lookup. (eab_merging_book_commit_contact): set lookup->avoid to the contact, and make the same s/eab_contact_locate_match_full/add_lookup/ replacement. svn path=/trunk/; revision=27038
* Implement. (eab_contact_compare_name): Don't leak if only one of theHans Petter Jansson2004-06-262-2/+44
| | | | | | | | | | | | 2004-06-25 Hans Petter Jansson <hpj@ximian.com> * gui/meging/eab-contact-compare.[ch] (eab_contact_compare_file_as): Implement. (eab_contact_compare_name): Don't leak if only one of the strings is NULL. (use_common_book_cb): Include file_as in query. svn path=/trunk/; revision=26527
* EBookContactsCallback -> EBookListCallback. (eab_nickname_query): same.Chris Toshok2004-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Set the default image for the contact photo to be the stock_person imageRodney Dawes2004-04-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-04-19 Rodney Dawes <dobey@ximian.com> * gui/contact-editor/contact-editor.glade: Set the default image for the contact photo to be the stock_person image in the icon theme 2004-04-19 Michael Terry <mike@mterry.name> * gui/component/GNOME_Evolution_Addressbook.server.in.in: * gui/component/addressbook-component.c: * gui/component/addressbook-view.c: * gui/component/select-names/e-select-names-popup.c: * gui/contact-editor/e-contact-editor-address.c: * gui/contact-editor/e-contact-editor-fullname.c: * gui/contact-editor/e-contact-editor-im.c: * gui/contact-list-editor/contact-list-editor.glade: * gui/contact-list-editor/e-contact-list-editor.c: * gui/merging/eab-contact-commit-duplicate-detected.glade: * gui/merging/eab-contact-duplicate-detected.glade: * gui/widgets/e-minicard.c: * gui/widgets/eab-contact-display.c: * gui/widgets/eab-gui-util.c: Update the addressbook to use the icon theme via the EIconFactory object in e-util svn path=/trunk/; revision=25514
* use the correct glade filename.Chris Toshok2004-04-061-1/+1
| | | | | | | | | 2004-04-05 Chris Toshok <toshok@ximian.com> * gui/merging/eab-contact-merging.c (match_query_callback): use the correct glade filename. svn path=/trunk/; revision=25327
* Move unused variable declaration inside notyet conditional.Hans Petter Jansson2004-02-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 bug #53620 ]Chris Toshok2004-02-181-3/+3
| | | | | | | | | | | | 2004-02-17 Chris Toshok <toshok@ximian.com> [ fixes bug #53620 ] * gui/merging/eab-contact-compare.c (eab_contact_compare_name): "" is a valid (and common) value for elements of EContactName now. it's semantically equivalent to NULL in the old ECard foo. svn path=/trunk/; revision=24769
* [ fixes bug #52955 ] handle the case properly where there are no queryChris Toshok2004-01-211-3/+8
| | | | | | | | | | | | | | | 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
* Update for API changes to e-book-asyncRoss Burton2004-01-091-6/+10
| | | | svn path=/trunk/; revision=24130
* Remove hard coded disable deprecated flagsJP Rosevear2003-12-071-4/+0
| | | | | | | | 2003-12-06 JP Rosevear <jpr@ximian.com> * */Makefile.am: Remove hard coded disable deprecated flags svn path=/trunk/; revision=23658
* Various changes to merge in evolution-data-server reliance.JP Rosevear2003-11-072-3/+3
| | | | svn path=/trunk/; revision=23206
* Merge new-ui-branch to the trunk.Ettore Perazzoli2003-10-2210-246/+1059
| | | | svn path=/trunk/; revision=22965
* add a g_object_ref(card), to match the one inChris Toshok2003-05-201-1/+1
| | | | | | | | | | 2003-05-19 Chris Toshok <toshok@ximian.com> * gui/merging/e-card-merging.c (e_card_merging_book_commit_card): add a g_object_ref(card), to match the one in e_card_merging_book_add_card. Fixes #43175. svn path=/trunk/; revision=21259
* Changed button order, and added HIG-appropriate spacing/padding. Fixes bugAnna Marie Dirks2003-05-191-6/+8
| | | | | | | | | | 2003-05-19 Anna Marie Dirks <anna@ximian.com> * gui/merging/e-card-merging-book-commit-duplicate-detected.glade: Changed button order, and added HIG-appropriate spacing/padding. Fixes bug #41232. svn path=/trunk/; revision=21248
* Changed button order, and added HIG-appropriate spacing/padding. Fixes bugAnna Marie Dirks2003-05-191-8/+10
| | | | | | | | | | 2003-05-19 Anna Marie Dirks <anna@ximian.com> * gui/merging/e-card-duplicate-detected.glade: Changed button order, and added HIG-appropriate spacing/padding. Fixes bug #41229 and #41231. svn path=/trunk/; revision=21246
* new function, split out the duplicated teardown code from final_cb andChris Toshok2003-05-161-7/+12
| | | | | | | | | | | | | 2003-05-15 Chris Toshok <toshok@ximian.com> * gui/merging/e-card-merging.c (free_lookup): new function, split out the duplicated teardown code from final_cb and final_id_cb. also, unref the card. (final_id_cb): call free_lookup. (final_cb): same. (e_card_merging_book_add_card): ref the card. fixes bug #43016. svn path=/trunk/; revision=21200
* [ fixes bug #40715 ] add this callback, to unref the book/free the closureChris Toshok2003-04-041-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2003-04-03 Chris Toshok <toshok@ximian.com> [ fixes bug #40715 ] * gui/merging/e-card-merging.c (final_id_cb): add this callback, to unref the book/free the closure after calling the user's callback. (final_cb): same. (doit): use final{_id}_cb (cancelit): same. (response): don't free the lookup struct here. (match_query_callback): same. (e_card_merging_book_add_card): ref the book. (e_card_merging_book_commit_card): same. * gui/component/e-address-popup.c (card_picker_init): make sure to set the "text" attribute on the cell renderer so the text actually shows up. also, g_object_connect -> g_signal_connect *sigh*. Lastly, get rid of the scrolled window and just make the window size to show the text. * gui/widgets/e-minicard.c (e_minicard_style_set): only call set_selected if we're realized (we create all the canvas objects that set_selected manipulates in our realize method.) svn path=/trunk/; revision=20662
* Build libecontacteditor as an uninstalled shared library.Dan Winship2003-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | * gui/contact-editor/Makefile.am: Build libecontacteditor as an uninstalled shared library. * gui/contact-list-editor/Makefile.am: Likewise for libecontactlisteditor * gui/merging/Makefile.am: and libecardmerging * gui/search/Makefile.am: and libeaddressbooksearch * gui/widgets/Makefile.am: and libeminicard * printing/Makefile.am: and libecontactprint * gui/component/Makefile.am (libevolution_addressbook_la_LIBADD): Update for new library names (and get rid of libtool portability warnings). svn path=/trunk/; revision=20112
* revert previous changeDan Winship2003-02-201-3/+3
| | | | svn path=/trunk/; revision=19968
* Build the subparts as (noinst) shared libraries rather than staticDan Winship2003-02-201-3/+3
| | | | | | | | | | | | | * gui/component/Makefile.am: * gui/contact-editor/Makefile.am: * gui/contact-list-editor/Makefile.am: * gui/search/Makefile.am: * gui/widgets/Makefile.am: * printing/Makefile.am: Build the subparts as (noinst) shared libraries rather than static libraries, so they can be portably linked into libevolution-addressbook.so svn path=/trunk/; revision=19963
* Remove cruft. Define in terms of privdatadirDan Winship2003-02-061-2/+0
| | | | | | | * gui/merging/Makefile.am (INCLUDES): Remove cruft. * gui/search/Makefile.am (ruledir): Define in terms of privdatadir svn path=/trunk/; revision=19783
* Version using $(BASE_VERSION). (etspecdir): Likewise. (iconsdir):Ettore Perazzoli2003-01-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | * gui/component/select-names/Makefile.am (gladedir): Version using $(BASE_VERSION). (etspecdir): Likewise. (iconsdir): Likewise. * gui/contact-list-editor/Makefile.am (iconsdir): Version using $(BASE_VERSION). (gladedir): Likewise. * gui/merging/Makefile.am (gladedir): Version using $(BASE_VERSION). * gui/search/Makefile.am (ruledir): Version using $(BASE_VERSION). * gui/component/Makefile.am (INCLUDES): Update EVOLUTION_IMAGESDIR to be versioned through $(BASE_VERSION). * gui/widgets/e-addressbook-view.c (init_collection): Use EVOLUTION_GALVIEWSDIR. * gui/widgets/Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR and update EVOLUTION_IMAGESDIR. svn path=/trunk/; revision=19551
* drop use of "font" arg. (get_left_width): use pango to calculate thisChris Toshok2002-12-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2002-12-18 Chris Toshok <toshok@ximian.com> * gui/widgets/e-minicard.c (e_minicard_realize): drop use of "font" arg. (get_left_width): use pango to calculate this instead of a GdkFont. * gui/widgets/e-minicard-view.c: drop include of e-unicode.h. * gui/widgets/e-minicard-label.c (e_minicard_label_construct): don't need to create the font anymore. * gui/search/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED. * gui/search/e-addressbook-search-dialog.c (e_addressbook_search_dialog_new): use g_object_new instead of gtk_type_new. * gui/merging/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED. * gui/contact-list-editor/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED. * gui/contact-list-editor/e-contact-list-editor.c (is_named): strdup (or not, if we don't need to save the value) instead of using the e_utf8 functions. (fill_in_info): same. * gui/contact-editor/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED. * gui/contact-editor/e-contact-save-as.c (e_contact_save_as): strdup (or not, if we don't need to save the value) instead of using the e_utf8 functions. (e_contact_list_save_as): same. * gui/contact-editor/e-contact-quick-add.c (clicked_cb): strdup (or not, if we don't need to save the value) instead of using the e_utf8 functions. (build_quick_add_dialog): same. * gui/contact-editor/e-contact-editor.c (phone_entry_changed): strdup (or not, if we don't need to save the value) instead of using the e_utf8 functions. (file_as_set_style): same. (name_entry_changed): same. (full_name_clicked): same. (categories_clicked): same. (set_field): same. (fill_in_field): same. (fill_in_single_field): same. (extract_field): same. (extract_single_field): same. * gui/contact-editor/e-contact-editor-fullname.c (extract_field): just strdup, it's already utf8. * gui/contact-editor/e-contact-editor-address.c (extract_field): they're all entries, use GTK_ENTRY foo here. * gui/component/select-names/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED. * gui/component/select-names/e-select-names.c (e_select_names_add_section): remove the extra utf8_from_locale_string stuff. * gui/component/select-names/e-select-names-popup.c (set_uiinfo_label): gtk_container_children -> gtk_container_get_children, and remove the extra utf8 stuff. * gui/component/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED. * gui/component/addressbook-storage.c (addressbook_storage_init_source_uri): g_string_sprintfa -> g_string_append_printf. * gui/component/addressbook-config.c (focus_help): gtk_notebook_set_page -> gtk_notebook_set_current_page. (addressbook_source_dialog_set_source): same. (auth_optionmenu_activated): gtk_container_children -> gtk_container_get_children. (ssl_optionmenu_activated): same. (ssl_optionmenu_selected): same, and gtk_notebook_set_page -> gtk_notebook_set_current_page. (scope_optionmenu_activated): same. (set_advanced_button_state): same. (addressbook_ldap_init): hook "response" to gtk_widget_destroy to make the dialog go away when clicked. (addressbook_ldap_auth): same. (addressbook_root_dse_query): same. (do_ldap_root_dse_query): same. (addressbook_config_control_new): fix return type and cast. (main): remove call to gtk_widget_push_visual. * gui/component/addressbook-config.h: addressbook_config_control_new returns a BonoboObject, not a BonoboControl. * gui/component/addressbook.c: remove e-unicode.h include. * backend/pas/Makefile.am (INCLUDES): Add -DLIBGNOME_DISABLE_DEPRECATED. * backend/ebook/Makefile.am (INCLUDES): Add -DLIBGNOME_DISABLE_DEPRECATED. * backend/ebook/e-card.c (e_card_get_property): remove misleading comment. svn path=/trunk/; revision=19160
* change signature to that of a weak ref notify function. (main): ::destroyChris Toshok2002-11-123-478/+390
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2002-11-11 Chris Toshok <toshok@ximian.com> * gui/widgets/test-reflow.c (destroy_callback): change signature to that of a weak ref notify function. (main): ::destroy -> weak_ref. * gui/widgets/test-minicard.c (destroy_callback): change signature to that of a weak ref notify function. (main): ::destroy -> weak_ref. * gui/widgets/test-minicard-view.c (destroy_callback): change signature to that of a weak ref notify function. (main): ::destroy -> weak_ref. * gui/widgets/test-minicard-label.c (destroy_callback): change signature to that of a weak ref notify function. (main): ::destroy -> weak_ref. * gui/widgets/e-minicard-widget.c (e_minicard_widget_init): ifdef out the call to gnome_canvas_set_scroll_region. It doesn't seem necessary judging from the rest of the code, and it also crashes the addressbook if it's in. * gui/widgets/e-minicard-widget-test.c (destroy_callback): change signature to that of a weak ref notify function. (main): ::destroy -> weak_ref. * gui/widgets/e-minicard-control.c (free_struct): change signature to that of a weak ref notify function. (e_minicard_control_factory): ::destroy -> weak_ref. * gui/widgets/e-addressbook-view.c (e_addressbook_view_init): ::destroy -> weak_ref. (e_addressbook_view_print): same. (free_closure): change signature to that of a weak ref notify function. (e_contact_print_destroy): same. (invisible_destroyed): same. * gui/widgets/e-addressbook-util.c (e_addressbook_prompt_save_dialog): convert from GnomeDialog to GtkDialog. (e_addressbook_show_multiple_cards): same. * gui/contact-list-editor/e-contact-list-editor.c (prompt_to_save_changes): change response ids to use GTK_RESPONSE_. * gui/component/select-names/e-select-names-manager.c (clear_widget): new function. (e_select_names_manager_activate_dialog): ::destroy -> weak_ref. * gui/component/select-names/e-select-names.c (clear_widget): change signature to that of a weak ref notify function. (e_select_names_init): ::destroy -> weak_ref. * gui/component/e-address-popup.c (mini_wizard_destroy_cb): change signature to that of a weak ref notify function. (mini_wizard_new): ::destroy -> weak_ref. * gui/component/addressbook-config.c (addressbook_source_dialog_destroy): change signature to that of a weak ref notify function. (ldap_config_control_destroy_callback): same. (addressbook_add_server_druid): ::destroy -> weak_ref. (addressbook_edit_server_dialog): same. (ldap_config_control_new): same. * gui/component/addressbook.c (destroy_callback): change signature to that of a a weak ref notify function. (addressbook_factory_new_control): ::destroy -> weak_ref. * gui/merging/e-card-merging.c (response): rename clicked to this, and destroy the dialog here. (match_query_callback): ::clicked -> ::response * gui/merging/e-card-merging-book-commit-duplicate-detected.glade: convert. * gui/merging/e-card-duplicate-detected.glade: same. svn path=/trunk/; revision=18719
* port work.Chris Toshok2002-11-091-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2002-11-08 Chris Toshok <toshok@ximian.com> * gui/widgets/test-reflow.c: port work. * gui/widgets/test-minicard-view.c: port work. * gui/widgets/e-minicard.[ch]: port work. * gui/widgets/e-minicard-widget.c: port work. * gui/widgets/e-minicard-view.c: port work. * gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_size_allocate): gtk_->g_ change i missed. (e_minicard_view_widget_reflow): same. * gui/widgets/e-minicard-label.c: port work. * gui/widgets/e-minicard-control.c (get_prop): gtk_->g_ change i missed. * gui/widgets/e-addressbook-view.c (setup_menus): ifdef this PENDING_PORT_WORK for now. (has_email_address_1): gtk_->g_ change i missed. (print): remove the PENDING_PORT_WORK from here, as the print_* symbols now resolve. (delete): gtk_->g_ changes. (new_card): same. (new_list): same. (sources): same. (create_minicard_view): same. (table_double_click): same. (create_table_view): same. (e_contact_print_destroy): same. (e_contact_print_button): same. (e_addressbook_view_print): same, and remove the PENDING_PORT_WORK ifdef. (e_addressbook_view_print_preview): same. (do_remove): gtk_->g_ changes. (e_addressbook_view_save_state): same. (view_transfer_cards): same. * gui/widgets/e-addressbook-view.h (struct _EAddressbookView): GtkObject -> GObject. * gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog): GnomeDialog -> GtkDialog. * gui/widgets/e-addressbook-table-adapter.c (addressbook_set_value_at): a gtk_->g_ change i missed. (e_addressbook_table_adapter_class_init): gtk_type_class -> g_type_class_peek_parent. * gui/widgets/e-addressbook-reflow-adapter.c (addressbook_get_property): use g_object_get_property for aggregated properties. (e_addressbook_reflow_adapter_class_init): gtk_type_class -> g_type_class_peek_parent. * gui/merging/e-card-merging.c (match_query_callback): some misc gtk_->g_ changes i missed. svn path=/trunk/; revision=18682
* only build the backend and gui dirs for now. printing and conduits areChris Toshok2002-11-062-6/+4
| | | | | | | | | | | | 2002-11-06 Chris Toshok <toshok@ximian.com> * Makefile.am (SUBDIRS): only build the backend and gui dirs for now. printing and conduits are no-man's land at present. * addressbook/gui/merging/e-card-merging.[ch]: Port to GObject/gnome2. svn path=/trunk/; revision=18595
* Add include lines to get ebook headers relative to <ebook/foo.h>, notPeter Williams2002-07-112-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2002-07-09 Peter Williams <peterw@ximian.com> * tools/Makefile.am (INCLUDES): Add include lines to get ebook headers relative to <ebook/foo.h>, not "foo.h". addressbook: 2002-07-08 Peter Williams <peterw@ximian.com> * backend/ebook/e-book.h: Normalize includes to <ebook/foo.h>, so that the installed headers will work sanely. * backend/ebook/e-card-cursor.h: * backend/ebook/e-book-view.h: * backend/ebook/e-card-simple.h: * backend/ebook/e-card.h: * backend/ebook/e-destination.h: Same. * printing/Makefile.am (INCLUDES): add -Iaddressbook/backend to access the ebook headers. Also the builddir version to get the generated addressbook.h * gui/widgets/Makefile.am (INCLUDES): Same builddir fix. * gui/merging/e-card-merging.c: Fix an ebook #include. * gui/merging/Makefile.am (INCLUDES): Same idea. * gui/contact-list-editor/Makefile.am (INCLUDES): Same. * gui/contact-editor/Makefile.am (INCLUDES): Same builddir change. calendar: 2002-07-08 Peter Williams <peterw@ximian.com> * gui/Makefile.am (INCLUDES): Change the -I flags to get it to play nicely with the new Ebook header paradigm. * gui/dialogs/Makefile.am: Same. * gui/e-meeting-model.c: More of the same. * gui/dialogs/e-delegate-dialog.c: * gui/dialogs/e-meeting-model.c: * gui/dialogs/comp-editor-util.c: Fix include lines to get ebook headers. * pcs/Makefile.am: Same. composer: 2002-07-08 Peter Williams <peterw@ximian.com> * Makefile.am (INCLUDES): Fix cflags for ebook header namespacing. importers: 2002-07-08 Peter Williams <peterw@ximian.com> * Makefile.am: Fix cflags to get at ebook headers correctly. * pine-importer.c: Fix include lines to get ebook headers the "right" way. * evolution-gnomecard-importer.c: Same. mail: 2002-07-08 Peter Williams <peterw@ximian.com> * Makefile.am (INCLUDES): Add -I flags to get the ebook headers. svn path=/trunk/; revision=17411
* ignore .pureChris Toshok2002-04-021-0/+1
| | | | svn path=/trunk/; revision=16312
* Final cleanup for the CFLAGS and LIBS in the Makefiles.Ettore Perazzoli2002-01-281-2/+1
| | | | svn path=/trunk/; revision=15486
* Make "stop" do nothing but set the stopped flag, as inJon Trowbridge2001-09-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-09-15 Jon Trowbridge <trow@ximian.com> * backend/ebook/e-book-listener.c (e_book_listener_stop): Make "stop" do nothing but set the stopped flag, as in e-book-view-listener.c. (e_book_listener_destroy): Clean up our queue here, rather than in e_book_listener_stop. (response_free): Added. Move the rather lengthy bit of code needed to free a EBookListenerResponse into one place. (e_book_listener_check_queue): Properly deal with the stopped flag. (e_book_listener_queue_response): If the stopped flag is set, just drop the incoming response. * backend/ebook/e-book-view-listener.c (e_book_view_listener_stop): Make "stop" do nothing but set the stopped flag. (e_book_view_listener_destroy): Move all of the clean-up that used to be in e_book_view_listener_stop here. This considerably simplifies the logic required to avoid various race conditions. (e_book_view_listener_check_queue): Properly deal with the stopped flag. (e_book_view_listener_queue_response): Drop all incoming responses if we are stopped. 2001-09-14 Jon Trowbridge <trow@ximian.com> * backend/pas/pas-book.c (pas_book_queue_request): Hold a reference to the book on behalf of our idle function. (pas_book_check_queue): When we are finished, drop the reference we've been holding on behalf of the idle function. * backend/pas/pas-backend-file.c (pas_backend_file_process_create_card): Hold a reference to the book_view while sending our notifications. (pas_backend_file_process_remove_card): Hold a reference to the book_view while sending our notifications. * gui/contact-editor/e-contact-quick-add.c (quick_add_unref): Remove debugging spew. * backend/ebook/e-book-util.c: Remove a lot of unused code that worked around bugs that have long since been fixed. (simple_query_disconnect): Added. Breaks out the part of simple_query_free that disconnect signals. (simple_query_free): Replace code w/ a call to simple_query_disconnect. (simple_query_sequence_complete_cb): Call simple_query_disconnect before executing the callback, so that our callbacks don't get triggered by any book changes that might occur during that callback. * backend/ebook/e-book-view-listener.c (e_book_view_listener_check_queue): Changed to be consistent with e_book_listener_check_queue. (e_book_view_listener_queue_response): Also changed to use a high-frequency timeout. * backend/ebook/e-book-listener.c (e_book_listener_check_queue): OK, I've agonized over this stupid little function, and it should now be race-free. (e_book_listener_queue_response): We process our response queue in a high-frequency timeout rather than an idle. Using an idle function leads to some tricky race conditions and bad interactions with bonobo's semi-broken attempts to take over event processing. (e_book_view_listener_stop): Manually disable our timeout and clean up. svn path=/trunk/; revision=12851
* Got rid of an extraneous _ here.Christopher James Lahey2001-08-141-1/+1
| | | | | | | | | | | | 2001-08-14 Christopher James Lahey <clahey@ximian.com> * gui/merging/e-card-merging-book-commit-duplicate-detected.glade: Got rid of an extraneous _ here. * gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog): Changed Canceled to Cancelled here. Fixes Ximian bug #2465. svn path=/trunk/; revision=12002
* "_Add Anyway" to "Add Anyway".Jason Leach2001-07-251-1/+1
| | | | | | | | | 2001-07-24 Jason Leach <jleach@ximian.com> * gui/merging/e-card-duplicate-detected.glade: "_Add Anyway" to "Add Anyway". svn path=/trunk/; revision=11359
* Patch from Taylor Hayward <thayward@gjpc.com>. Added accelerators to a fewChristopher James Lahey2001-07-172-2/+2
| | | | | | | | | | | | 2001-07-17 Christopher James Lahey <clahey@ximian.com> * gui/contact-editor/contact-editor.glade, gui/merging/e-card-duplicate-detected.glade, gui/merging/e-card-merging-book-commit-duplicate-detected.glade, printing/e-contact-print.glade: Patch from Taylor Hayward <thayward@gjpc.com>. Added accelerators to a few dialogs. svn path=/trunk/; revision=11153
* Make the standard for considering two cards to be match stricter.Jon Trowbridge2001-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-06-30 Jon Trowbridge <trow@ximian.com> * gui/merging/e-card-merging.c (match_query_callback): Make the standard for considering two cards to be match stricter. * gui/component/select-names/e-select-names-completion.c (make_match): Use the card's use-score to set the match's sort_major value. (match_name): Removed obsolete code. (e_select_names_completion_begin): Added (double) cast to make match->score calculation come out properly. * backend/ebook/e-card.c: Added X-EVOLUTION-LAST-USE and X-EVOLUTION-USE-SCORE to attribute_jump_array. (e_card_get_today): Added. A convenience routine for getting today's date and putting it in a GDate. (e_card_get_use_score): Added. Compute the current, time-decayed, use-score for the card. (e_card_touch): Increment the use-score by one; update the last used date. (e_card_date_to_string): Added as a convenience routine, getting rid of some code duplication. (e_card_get_vobject): Add handlers for X-EVOLUTION-USE-SCORE and X-EVOLUTION-LAST-USE. (parse_last_use): Added. (parse_use_score): Added. (e_card_class_init): Added args for last-use and use-score. (e_card_get_arg): Added handlers for last-use and use-score. o (e_card_set_arg): Added handlers for last-use and use-score. * backend/ebook/e-destination.c: Added pending_card_id to EDestinationPrivate struct. (e_destination_copy): Copy the pending_card_id. (e_destination_is_empty): Check for a pending_card_id. We are non-empty if we have one. (e_destination_clear_card): Clear pending_card_id. (e_destination_set_card): Clear pending_card_id. (e_destination_has_pending_card): Added. (e_destination_use_card): Added. An asynchronous way to load a pending card and then apply a callback to it. (build_field): Be paranoid, map our special characters to '_'. (e_destination_export): Use EXPORT_MAX_FIELDS symbol rather than a hard-wired array size. Added the "card" entry. (e_destination_import): Fix bug in handling of the "name" field. Process the "card" field. (e_destination_touch): "Touch" and commit the ECard corresponding to the e-mail address in the destination. (A query against the local addressbook is actually performed, in case the destination isn't cardified. * backend/ebook/e-card-compare.c (e_card_compare_name): Revamp the way E_CARD_MATCH_FOO results are mapped to comparison results. Report better matches when the family name is matched. svn path=/trunk/; revision=10626
* Added e-card-merging-book-commit-duplicate-detected.glade here.Christopher James Lahey2001-06-114-12/+336
| | | | | | | | | | | | | | | | | | | | | 2001-06-11 Christopher James Lahey <clahey@ximian.com> * gui/merging/Makefile.am (glade_DATA): Added e-card-merging-book-commit-duplicate-detected.glade here. * gui/merging/e-card-merging-book-commit-duplicate-detected.glade: Added this file. The GUI for asking whether to commit a modified card. * gui/merging/e-card-merging.c, gui/merging/e-card-merging.h (e_card_merging_book_commit_card): Added this function. * gui/widgets/e-addressbook-table-adapter.c (addressbook_set_value_at), gui/widgets/e-addressbook-util.c (commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use e_card_merging_book_commit_card instead of e_book_commit_card here. svn path=/trunk/; revision=10184
* Added this function to let you do slightly more complicated searches.Christopher James Lahey2001-06-111-1/+1
| | | | | | | | | | | | | | 2001-06-11 Christopher James Lahey <clahey@ximian.com> * backend/ebook/e-card-compare.c, backend/ebook/e-card-compare.h (e_card_locate_match_full): Added this function to let you do slightly more complicated searches. * gui/merging/e-card-merging.c (e_card_merging_book_add_card): Use e_card_locate_match_full to check if the card exists in the book it's being added to instead of in the default book. svn path=/trunk/; revision=10178
* Null terminate the strv here. (e_card_locate_match): ref here instead ofChristopher James Lahey2001-06-095-0/+410
2001-06-09 Christopher James Lahey <clahey@ximian.com> * backend/ebook/e-card-compare.c (use_common_book_cb): Null terminate the strv here. (e_card_locate_match): ref here instead of unref. * backend/ebook/e-card-simple.c (e_card_simple_get): Handle a NULL card here. * contact-editor/Makefile.am (INCLUDES), gui/widgets/Makefile.am (INCLUDES): Added addressbook/gui/merging here. * contact-editor/e-contact-quick-add.c (book_ready_cb), gui/component/addressbook-component.c (dnd_drop_book_open_cb), gui/widgets/e-addressbook-table-adapter.c (addressbook_append_row), gui/widgets/e-addressbook-util.c (add_card_cb), gui/widgets/e-addressbook-view.c (selection_received), gui/widgets/e-minicard-control.c (book_open_cb): Use e_card_merging_book_add_card instead of e_book_add_card here. * gui/Makefile.am (SUBDIRS): Added merging. * gui/component/Makefile.am (evolution_addressbook_LDADD), gui/widgets/Makefile.am (minicard_test_LDADD, minicard_widget_test_LDADD): Added libecardmerging.a here. * gui/merging/, gui/merging/.cvsignore, gui/merging/Makefile.am: New addressbook library. * gui/merging/e-card-duplicate-detected.glade: Glade file for duplicate detected dialog. * gui/merging/e-card-merging.c, gui/merging/e-card-merging.h: New files for detecting duplicates before adding and putting up a dialog if duplicates are found. * gui/widgets/e-minicard-view.c: Include e-addressbook-util.h here. svn path=/trunk/; revision=10170
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 18:14:10 +0800