aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/merging/eab-contact-compare.c
Commit message (Collapse)AuthorAgeFilesLines
* Bug #646109 - Fix use of include <config.h> to make sure translations workMilan Crha2011-06-301-0/+3
|
* Coding style cleanups.Matthew Barnes2011-06-301-6/+6
|
* Bug #640707 - Crash on 'Add to address book'->'Edit full' clickMilan Crha2011-06-301-1/+1
|
* Use e_load_book_source_async() for all EBook loading.Matthew Barnes2011-06-301-24/+42
|
* Coding style cleanups.Matthew Barnes2010-09-131-1/+1
|
* addressbook: Port to use new _async suffix instead of _ex suffixRob Bradford2010-08-021-3/+3
|
* Bug #623204 - Be able to report detailed errors from backendsMilan Crha2010-07-091-8/+8
|
* Coding style and whitespace cleanup.Matthew Barnes2010-01-311-1/+1
|
* More whitespace cleanup.Matthew Barnes2009-07-191-5/+5
|
* Fix excessive whitespace.Matthew Barnes2009-07-141-5/+0
|
* Prefer GLib basic types over C types.Matthew Barnes2009-05-271-4/+4
|
* Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-271-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: a11y/widgets/ea-combo-button.c a11y/widgets/ea-combo-button.h addressbook/gui/component/addressbook-component.c addressbook/gui/component/addressbook-component.h addressbook/gui/component/addressbook-view.c addressbook/gui/component/addressbook-view.h addressbook/gui/component/component-factory.c addressbook/gui/widgets/e-addressbook-view.c addressbook/gui/widgets/eab-contact-display.c addressbook/gui/widgets/eab-gui-util.h addressbook/gui/widgets/eab-menu.c addressbook/gui/widgets/eab-menu.h addressbook/gui/widgets/eab-popup-control.c addressbook/gui/widgets/eab-popup-control.h addressbook/gui/widgets/eab-popup.c addressbook/gui/widgets/eab-popup.h calendar/gui/cal-search-bar.c calendar/gui/calendar-commands.c calendar/gui/calendar-component.c calendar/gui/comp-editor-factory.c calendar/gui/comp-editor-factory.h calendar/gui/control-factory.c calendar/gui/dialogs/comp-editor.c calendar/gui/e-cal-component-memo-preview.c calendar/gui/e-cal-component-memo-preview.h calendar/gui/e-calendar-table.c calendar/gui/e-memo-table.c calendar/gui/e-memos.c calendar/gui/e-tasks.c calendar/gui/gnome-cal.c calendar/gui/gnome-cal.h calendar/gui/itip-bonobo-control.c calendar/gui/itip-bonobo-control.h calendar/gui/main.c calendar/gui/memos-component.c calendar/gui/memos-control.c calendar/gui/memos-control.h calendar/gui/migration.c calendar/gui/migration.h calendar/gui/tasks-component.c calendar/gui/tasks-control.c calendar/importers/main.c composer/Makefile.am composer/e-composer-header-table.c composer/e-composer-header.c composer/e-composer-header.h composer/e-composer-name-header.c composer/e-composer-private.c composer/e-composer-text-header.c composer/e-msg-composer.c composer/e-msg-composer.h e-util/e-corba-utils.h e-util/e-logger.c e-util/e-logger.h e-util/e-util-labels.c e-util/e-util-labels.h em-format/em-format.c mail/Makefile.am mail/e-mail-shell-migrate.c mail/em-account-editor.c mail/em-account-editor.h mail/em-composer-prefs.c mail/em-composer-utils.c mail/em-composer-utils.h mail/em-folder-browser.c mail/em-folder-tree-model.c mail/em-folder-tree.c mail/em-folder-tree.h mail/em-folder-utils.c mail/em-folder-utils.h mail/em-folder-view.c mail/em-format-html-display.c mail/em-format-html.c mail/em-mailer-prefs.c mail/em-mailer-prefs.h mail/em-message-browser.c mail/em-message-browser.h mail/em-network-prefs.h mail/em-popup.c mail/em-utils.c mail/importers/Makefile.am mail/mail-component-factory.c mail/mail-component.c mail/mail-config-factory.c mail/mail-config-factory.h mail/mail-config.c mail/mail-dialogs.glade mail/mail-types.h plugins/calendar-weather/calendar-weather.c plugins/mail-account-disable/mail-account-disable.c plugins/select-one-source/select-one-source.c po/POTFILES.in shell/e-component-registry.c shell/e-component-registry.h shell/e-component-view.c shell/e-component-view.h shell/e-corba-config-page.c shell/e-corba-config-page.h shell/e-shell-constants.h shell/e-shell-settings-dialog.c shell/e-shell-settings-dialog.h shell/e-shell-window-commands.c shell/e-shell-window.c shell/e-shell.h shell/e-sidebar.c shell/e-sidebar.h shell/e-user-creatable-items-handler.c shell/e-user-creatable-items-handler.h shell/es-menu.c shell/es-menu.h shell/evolution-component.h shell/evolution-config-control.c shell/evolution-config-control.h shell/evolution-listener.c shell/evolution-listener.h shell/evolution-shell-component-utils.c shell/evolution-shell-component-utils.h shell/importer/evolution-importer-client.c shell/importer/evolution-importer-client.h shell/importer/evolution-importer-listener.c shell/importer/evolution-importer-listener.h shell/importer/evolution-importer.c shell/importer/evolution-importer.h shell/importer/evolution-intelligent-importer.c shell/importer/evolution-intelligent-importer.h shell/importer/intelligent.c shell/main.c shell/test/evolution-test-component.c shell/test/evolution-test-component.h widgets/menus/gal-view-instance.c widgets/menus/gal-view-menus.c widgets/menus/gal-view-menus.h widgets/misc/Makefile.am widgets/misc/e-activity-handler.c widgets/misc/e-activity-handler.h widgets/misc/e-charset-picker.c widgets/misc/e-combo-button.c widgets/misc/e-combo-button.h widgets/misc/e-config-page.h widgets/misc/e-dropdown-button.c widgets/misc/e-dropdown-button.h widgets/misc/e-filter-bar.c widgets/misc/e-info-label.c widgets/misc/e-info-label.h widgets/misc/e-multi-config-dialog.c widgets/misc/e-multi-config-dialog.h widgets/misc/e-search-bar.c widgets/misc/e-search-bar.h widgets/misc/e-task-bar.c widgets/misc/e-task-bar.h widgets/misc/e-task-widget.c widgets/misc/e-task-widget.h widgets/misc/test-dropdown-button.c widgets/misc/test-error.c widgets/misc/test-info-label.c widgets/table/e-table-example-1.c
| * Remove trailing whitespace, again.Matthew Barnes2009-05-271-1/+1
| |
| * Fix compiler warnings in addressbook.Matthew Barnes2009-05-261-1/+1
| |
| * Change License from GPL to LGPL. 2nd batch.Sankarasivasubramanian Pasupathilingam2008-09-031-19/+15
| | | | | | | | | | | | More changes to come. svn path=/trunk/; revision=36247
* | Rearranged some of the addressbook code to try and eliminate some circularMatthew Barnes2008-11-141-2/+2
| | | | | | | | | | | | | | | | dependencies in our libraries. The circular dependency between the composer and the mail module is still causing me headaches. And it doesn't help that the addressbook and calendar also want to link to the composer. svn path=/branches/kill-bonobo/; revision=36782
* | Merge revisions 36016:36303 from trunk.Matthew Barnes2008-09-111-19/+15
|/ | | | svn path=/branches/kill-bonobo/; revision=36307
* updated novell copyright notices (left others alone)Jeffrey Stedfast2008-06-211-1/+1
| | | | svn path=/trunk/; revision=35665
* ** Remove trailing whitespace from source code.Matthew Barnes2007-11-151-16/+16
| | | | | | | | | 2007-11-14 Matthew Barnes <mbarnes@redhat.com> ** Remove trailing whitespace from source code. svn path=/trunk/; revision=34537
* Update FSF address in header comments (#469886). Patch from TobiasMatthew Barnes2007-09-021-1/+1
| | | | | | | | | | 2007-09-02 Matthew Barnes <mbarnes@redhat.com> * Update FSF address in header comments (#469886). Patch from Tobias Mueller. svn path=/trunk/; revision=34151
* 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
* 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
* 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
* Implement. (eab_contact_compare_name): Don't leak if only one of theHans Petter Jansson2004-06-261-2/+43
| | | | | | | | | | | | 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
* 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
* Merge new-ui-branch to the trunk.Ettore Perazzoli2003-10-221-0/+736
svn path=/trunk/; revision=22965
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 08:23:17 +0800