aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/merging/eab-contact-merging.c
Commit message (Collapse)AuthorAgeFilesLines
* 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-18 08:40:37 +0800