aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/merging/eab-contact-merging.c
Commit message (Collapse)AuthorAgeFilesLines
* Coding style and whitespace cleanup.Matthew Barnes2012-08-201-1/+1
|
* Adapt addressbook/gui/merging to the new ESource API.Matthew Barnes2012-06-031-5/+17
|
* Reduce diff noise with 'account-mgmt' branch.Matthew Barnes2012-06-031-1/+3
| | | | One last time.
* Coding style and whitespace cleanup.Matthew Barnes2012-02-201-3/+10
|
* Bug #665036 - Memory leaks spot in Contacts viewMilan Crha2012-01-041-14/+25
|
* Fix compiler warnings.Matthew Barnes2011-12-171-19/+24
| | | | | gtk_dialog_new_with_buttons() requires some buttons, otherwise use gtk_dialog_new() and set title/transient-for/etc properties manually.
* Miscellaneous cleanups from the account-mgmt branch.Matthew Barnes2011-09-271-6/+14
| | | | | Reducing diff noise so I can see important changes easier when comparing branches. A few API changes, but nothing that affects functionality.
* Invalid unref when merging contactsMilan Crha2011-09-261-1/+2
|
* Coding style and whitespace cleanup.Matthew Barnes2011-09-041-24/+34
|
* Coding style and whitespace cleanup.Matthew Barnes2011-08-131-11/+35
|
* Do not use deprecated EBook/ECal APIMilan Crha2011-06-141-41/+100
|
* Bug #646109 - Fix use of include <config.h> to make sure translations workMilan Crha2011-05-271-0/+2
|
* Coding style cleanups.Matthew Barnes2011-05-091-22/+22
|
* Dialogs no longer have separators.Matthew Barnes2011-01-251-1/+1
|
* Drop backward-compatibility cruft.Matthew Barnes2011-01-251-3/+0
|
* Bug 632641 - Handle combo box text API going awayMatthias Clasen2010-10-211-8/+11
|
* Coding style cleanups.Matthew Barnes2010-09-131-26/+26
|
* addressbook: Port to use new _async suffix instead of _ex suffixRob Bradford2010-08-021-20/+20
|
* Bug #623204 - Be able to report detailed errors from backendsMilan Crha2010-07-091-20/+24
|
* Giant leap towards GSEAL compliance.Matthew Barnes2010-04-081-9/+21
|
* Bug 589153 - Use GtkBuilder instead of libgladeMatthew Barnes2009-11-171-30/+13
|
* Bug #599131 - Crash on new contact adding with similar values as an oldMilan Crha2009-10-241-1/+4
|
* Bug #565306 - "Edit Full" in "Add to address book" searches firstMilan Crha2009-10-161-9/+63
|
* Bug #596800 - Hang on contacts mergingMilan Crha2009-09-301-7/+8
|
* More whitespace cleanup.Matthew Barnes2009-07-191-12/+12
|
* Fix excessive whitespace.Matthew Barnes2009-07-141-1/+0
|
* More code cleanup.Matthew Barnes2009-06-021-3/+3
|
* Whitespace cleanup.Matthew Barnes2009-05-291-2/+2
|
* Prefer GLib basic types over C types.Matthew Barnes2009-05-271-20/+20
|
* Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |
| * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>Andre Klapper2008-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | 2008-12-23 Andre Klapper <a9016009@gmx.de> * gui/merging/eab-contact-merging.c: Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h> svn path=/trunk/; revision=36931
| * Change License from GPL to LGPL. 2nd batch.Sankarasivasubramanian Pasupathilingam2008-09-031-3/+17
| | | | | | | | | | | | More changes to come. svn path=/trunk/; revision=36247
* | Merge revisions 36866:37046 from trunk.Matthew Barnes2009-01-121-1/+1
| | | | | | | | svn path=/branches/kill-bonobo/; revision=37050
* | Progress update:Matthew Barnes2008-09-181-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Get context menus working in the contact preview pane. - Kill EABPopup. - Yet more code refactoring. - Add a handy utility function: e_shell_window_show_popup_menu() Takes a widget path in the shell window's UI definition. svn path=/branches/kill-bonobo/; revision=36366
* | Merge revisions 36016:36303 from trunk.Matthew Barnes2008-09-111-3/+17
|/ | | | 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
* ** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES andMatthew Barnes2008-06-061-5/+0
| | | | | | | | | | 2008-06-06 Matthew Barnes <mbarnes@redhat.com> ** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and GTK_DISABLE_SINGLE_INCLUDES defined. (#536637) svn path=/trunk/; revision=35606
* Use non-deprecated gtk+ api.Kjartan Maraas2008-06-041-1/+1
| | | | | | | | | 2008-06-03 Kjartan Maraas <kmaraas@gnome.org> * gui/merging/eab-contact-merging.c: (mergeit): Use non-deprecated gtk+ api. svn path=/trunk/; revision=35583
* Upstream patch from OpenSUSE.Srinivasa Ragavan2008-02-181-0/+1
| | | | | | | | | | | 2008-02-18 Srinivasa Ragavan <sragavan@novell.com> * gui/merging/eab-contact-merging.c: (mergeit): Upstream patch from OpenSUSE. svn path=/trunk/; revision=35030
* ** Remove trailing whitespace from source code.Matthew Barnes2007-11-151-26/+26
| | | | | | | | | 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
* 2007-08-24 Suman Manjunath Fix for bug #440328Milan Crha2007-08-241-1/+1
| | | | svn path=/trunk/; revision=34093
* 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-181-6/+288
| | | | svn path=/trunk/; revision=33428
* Fix for Bug 336713Devashish Sharma2006-04-211-4/+2
| | | | svn path=/trunk/; revision=31847
* 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
* Handling GTK_RESPONSE_DELETE_EVENT response.Sushma Rai2005-08-171-0/+3
| | | | svn path=/trunk/; revision=30144
* Fix some spacing and remove the separator for HIG compliance Set properRodney Dawes2005-01-221-0/+6
| | | | | | | | | | | | | 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
* [ 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
* 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
* Merge new-ui-branch to the trunk.Ettore Perazzoli2003-10-221-0/+197
svn path=/trunk/; revision=22965
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 11:19:49 +0800