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

9 files changed, 33 insertions, 20 deletions

diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 450c1d052f..772342041d 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -27,7 +27,6 @@ INCLUDES =						\
 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
 	-DDATADIR=\"$(datadir)\"			\
 	-DLIBDIR=\"$(libdir)\"				\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"        	\
 	-DG_LOG_DOMAIN=\"EBook\"			\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/camel				\
@@ -58,7 +57,7 @@ libebook_la_SOURCES =					\
 	e-destination.c
 
 
-libebookincludedir = $(includedir)/evolution-$(BASE_VERSION)/ebook
+libebookincludedir = $(privincludedir)/ebook
 
 libebookinclude_HEADERS =				\
 	e-book-listener.h				\
@@ -184,11 +183,10 @@ CLEANFILES    = $(BUILT_SOURCES)
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-serversdir = $(libdir)/bonobo/servers
 server_in_files = GNOME_Evolution_Addressbook_VCard_Importer.server.in \
 		  GNOME_Evolution_Addressbook_LDIF_Importer.server.in
-servers_DATA = $(server_in_files:.server.in=.server)
+server_DATA = $(server_in_files:.server.in=.server)
 
 @INTLTOOL_SERVER_RULE@
 
-EXTRA_DIST = $(server_in_files) $(servers_DATA) e-book-marshal.list
+EXTRA_DIST = $(server_in_files) $(server_DATA) e-book-marshal.list
diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c
index 7852a84675..aaba56f8dc 100644
--- a/addressbook/backend/ebook/e-book-util.c
+++ b/addressbook/backend/ebook/e-book-util.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #include "e-book-util.h"
 
+#include <string.h>
 #include <glib.h>
 #include <glib-object.h>
 #include <e-util/e-config-listener.h>
diff --git a/addressbook/backend/ebook/e-card-compare.c b/addressbook/backend/ebook/e-card-compare.c
index 1593bd022d..2413d987e5 100644
--- a/addressbook/backend/ebook/e-card-compare.c
+++ b/addressbook/backend/ebook/e-card-compare.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include <ctype.h>
+#include <string.h>
 #include "e-book-util.h"
 #include "e-card-compare.h"
 
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index 99a8672111..38ee1ce224 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -1925,7 +1925,7 @@ e_card_email_match_single_string (const gchar *a, const gchar *b)
 	for (xa=a; *xa && *xa != '@'; ++xa);
 	for (xb=b; *xb && *xb != '@'; ++xb);
 
-	if (xa-a != xb-b || *xa != *xb || g_strncasecmp (a, b, xa-a))
+	if (xa-a != xb-b || *xa != *xb || g_ascii_strncasecmp (a, b, xa-a))
 		return FALSE;
 
 	if (*xa == '\0')
@@ -1985,7 +1985,7 @@ e_card_email_find_number (const ECard *card, const gchar *email)
 
 	iter = e_list_get_iterator (card->email);
 	for (e_iterator_reset (iter); e_iterator_is_valid (iter); e_iterator_next (iter)) {
-		if (!g_strcasecmp (e_iterator_get (iter), email))
+		if (!g_ascii_strcasecmp (e_iterator_get (iter), email))
 			goto finished;
 		++count;
 	}
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
index 86108125cb..87c3d83ee3 100644
--- a/addressbook/backend/ebook/e-destination.c
+++ b/addressbook/backend/ebook/e-destination.c
@@ -404,8 +404,10 @@ e_destination_equal (const EDestination *a, const EDestination *b)
 	if ((na || nb) && !(na && nb && ! e_utf8_casefold_collate (na, nb)))
 		return FALSE;
 	
-	if (!g_strcasecmp (e_destination_get_email (a), e_destination_get_email (b)))
+	if (!g_ascii_strcasecmp (e_destination_get_email (a), e_destination_get_email (b)))
 		return TRUE;
+	else
+		return FALSE;
 }
 
 void
diff --git a/addressbook/backend/ebook/evolution-ldif-importer.c b/addressbook/backend/ebook/evolution-ldif-importer.c
index 6f4a3ac957..d64a9a0c40 100644
--- a/addressbook/backend/ebook/evolution-ldif-importer.c
+++ b/addressbook/backend/ebook/evolution-ldif-importer.c
@@ -18,11 +18,13 @@
 #include <string.h>
 
 #include <e-book.h>
+#include <e-book-util.h>
 #include <e-card-simple.h>
 #include <e-destination.h>
 
 #include <libgnome/gnome-init.h>
 #include <bonobo/bonobo-generic-factory.h>
+#include <bonobo/bonobo-main.h>
 
 #include <importer/evolution-importer.h>
 #include <importer/GNOME_Evolution_Importer.h>
@@ -238,17 +240,17 @@ parseLine( ECardSimple *simple, ECardDeliveryAddress *address, char **buf )
 
 		field_handled = FALSE;
 		for (i = 0; i < num_ldif_fields; i ++) {
-			if (!g_strcasecmp (ptr, ldif_fields[i].ldif_attribute)) {
+			if (!g_ascii_strcasecmp (ptr, ldif_fields[i].ldif_attribute)) {
 				if (ldif_fields[i].flags & FLAG_ADDRESS) {
-					if (!g_strcasecmp (ptr, "locality"))
+					if (!g_ascii_strcasecmp (ptr, "locality"))
 						address->city = g_strdup (ldif_value->str);
-					else if (!g_strcasecmp (ptr, "countryname"))
+					else if (!g_ascii_strcasecmp (ptr, "countryname"))
 						address->country = g_strdup (ldif_value->str);
-					else if (!g_strcasecmp (ptr, "postalcode"))
+					else if (!g_ascii_strcasecmp (ptr, "postalcode"))
 						address->code = g_strdup (ldif_value->str);
-					else if (!g_strcasecmp (ptr, "st"))
+					else if (!g_ascii_strcasecmp (ptr, "st"))
 						address->region = g_strdup (ldif_value->str);
-					else if (!g_strcasecmp (ptr, "streetaddress"))
+					else if (!g_ascii_strcasecmp (ptr, "streetaddress"))
 						address->street = g_strdup (ldif_value->str);
 				}
 				else {
@@ -262,12 +264,12 @@ parseLine( ECardSimple *simple, ECardDeliveryAddress *address, char **buf )
 
 		/* handle objectclass/dn/member out here */
 		if (!field_handled) {
-			if (!g_strcasecmp (ptr, "dn"))
+			if (!g_ascii_strcasecmp (ptr, "dn"))
 				g_hash_table_insert (dn_card_hash, g_strdup(ldif_value->str), simple->card);
-			else if (!g_strcasecmp (ptr, "objectclass") && !g_strcasecmp (ldif_value->str, "groupofnames")) {
+			else if (!g_ascii_strcasecmp (ptr, "objectclass") && !g_ascii_strcasecmp (ldif_value->str, "groupofnames")) {
 				e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_IS_LIST, "true");
 			}
-			else if (!g_strcasecmp (ptr, "member")) {
+			else if (!g_ascii_strcasecmp (ptr, "member")) {
 				EList *email;
 				g_object_get (simple->card,
 					      "email", &email,
@@ -450,8 +452,10 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure)
 static void
 ebook_create (LDIFImporter *gci)
 {
+#if 0
 	gchar *path, *uri;
-	
+#endif
+
 	gci->book = e_book_new ();
 
 	if (!gci->book) {
@@ -592,7 +596,7 @@ factory_fn (BonoboGenericFactory *_factory,
 		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;
 	}
 }
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;
 	}
 }
diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
index 38f3817d0f..9dc495badf 100644
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ b/addressbook/backend/ebook/load-pine-addressbook.c
@@ -2,6 +2,7 @@
 #include <config.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 #include <glib.h>
 #include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-main.h>
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
index 0ed9290759..bd11d93691 100644
--- a/addressbook/backend/ebook/test-client.c
+++ b/addressbook/backend/ebook/test-client.c
@@ -4,6 +4,8 @@
 #include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-main.h>
 #include <libgnome/gnome-init.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "e-book.h"
 #include "e-book-util.h"