diff options
| author | Hans Petter Jansson <hpj@ximian.com> | 2004-02-27 05:01:41 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2004-02-27 05:01:41 +0800 |
| commit | 9a4ee04a76f07a0183582b377260b9c37551a0ff (patch) | |
| tree | f26e533f3dabb5bf28d76e7b23954a6538aa9276 /addressbook/gui/merging | |
| parent | bac1a59d59bb0326bb8b634bbf6ec973b20efd16 (diff) | |
| download | gsoc2013-evolution-9a4ee04a76f07a0183582b377260b9c37551a0ff.tar gsoc2013-evolution-9a4ee04a76f07a0183582b377260b9c37551a0ff.tar.gz gsoc2013-evolution-9a4ee04a76f07a0183582b377260b9c37551a0ff.tar.bz2 gsoc2013-evolution-9a4ee04a76f07a0183582b377260b9c37551a0ff.tar.lz gsoc2013-evolution-9a4ee04a76f07a0183582b377260b9c37551a0ff.tar.xz gsoc2013-evolution-9a4ee04a76f07a0183582b377260b9c37551a0ff.tar.zst gsoc2013-evolution-9a4ee04a76f07a0183582b377260b9c37551a0ff.zip | |
Move unused variable declaration inside notyet conditional.
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
Diffstat (limited to 'addressbook/gui/merging')
| -rw-r--r-- | addressbook/gui/merging/eab-contact-compare.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index 33a696261e..f4f9afe1a7 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -29,6 +29,7 @@ #include <ctype.h> #include <string.h> #include "util/eab-book-util.h" +#include "../component/addressbook.h" #include "eab-contact-compare.h" /* This is an "optimistic" combiner: the best of the two outcomes is @@ -707,7 +708,7 @@ eab_contact_locate_match (EContact *contact, EABContactMatchQueryCallback cb, gp info->closure = closure; info->avoid = NULL; - addressbook_load_default_book (use_common_book_cb, info); + addressbook_load_default_book ((EBookCallback) use_common_book_cb, info); } /** @@ -740,6 +741,6 @@ eab_contact_locate_match_full (EBook *book, EContact *contact, GList *avoid, EAB if (book) use_common_book_cb (book, info); else - addressbook_load_default_book (use_common_book_cb, info); + addressbook_load_default_book ((EBookCallback) use_common_book_cb, info); } |