| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
svn path=/trunk/; revision=19968
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
|
|
|
|
|
|
| |
* gui/merging/Makefile.am (INCLUDES): Remove cruft.
* gui/search/Makefile.am (ruledir): Define in terms of privdatadir
svn path=/trunk/; revision=19783
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
svn path=/trunk/; revision=16312
|
|
|
|
| |
svn path=/trunk/; revision=15486
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
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
|