Remove cruft. (libebookincludedir): Use privincludedir.

	* backend/ebook/Makefile.am (INCLUDES): Remove cruft.
	(libebookincludedir): Use privincludedir.

	* backend/ebook/e-book-util.c: #include <string.h>
	* backend/ebook/e-card-compare.c: Likewise
	* backend/ebook/load-pine-addressbook.c: Likewise
	* backend/ebook/test-client.c: Likewise

	* backend/ebook/evolution-vcard-importer.c: #include
	<e-book-util.h>
	(factory_fn): Fix this to actually return the importer.

	* backend/ebook/evolution-ldif-importer.c (parseLine): #include
	<e-book-util.h> and <bonobo/bonobo-main.h>. Use g_ascii_strcmp.

	* backend/ebook/e-card.c (e_card_email_match_single_string):
	(e_card_email_find_number): s/g_str/g_ascii_str/
	* backend/ebook/e-destination.c (e_destination_equal): Likewise.
	Also, add an "else return FALSE;"

svn path=/trunk/; revision=19778

1 files changed, 5 insertions, 1 deletions

diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c
index a3b8d873bb..c16fab4019 100644
--- a/addressbook/backend/ebook/evolution-vcard-importer.c
+++ b/addressbook/backend/ebook/evolution-vcard-importer.c
@@ -8,6 +8,7 @@
 #include <bonobo/bonobo-main.h>
 
 #include <e-book.h>
+#include <e-book-util.h>
 
 #include <importer/evolution-importer.h>
 #include <importer/GNOME_Evolution_Importer.h>
@@ -45,8 +46,10 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure)
 static void
 ebook_create (VCardImporter *gci)
 {
+#if 0
 	gchar *path, *uri;
 	gchar *epath;
+#endif
 	
 	gci->book = e_book_new ();
 
@@ -224,9 +227,10 @@ factory_fn (BonoboGenericFactory *_factory,
 	
 		g_object_weak_ref (G_OBJECT (importer),
 				   importer_destroy_cb, gci);
+		return BONOBO_OBJECT (importer);
 	}
 	else {
-		g_warning (COMPONENT_FACTORY_IID, ": Don't know what to do with %s", component_id);
+		g_warning (COMPONENT_FACTORY_IID ": Don't know what to do with %s", component_id);
 		return NULL;
 	}
 }