*** empty log message ***

svn path=/trunk/; revision=5969

2 files changed, 6 insertions, 25 deletions

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index e56a85ac2e..e4d70982a2 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-17  Jesse Pavel  <jpavel@helixcode.com>
+
+	* ename/e-address-western.c: made the routines use the stardard e_strstrcase
+	instead of the included function that existed earlier.
+
 2000-10-11  Iain Holmes  <iain@helixcode.com>
 
 	* ename/e-address-western.c (e_address_western_parse): g_strconcat needs
diff --git a/e-util/ename/e-address-western.c b/e-util/ename/e-address-western.c
index 1538e2a3ad..9ab6568338 100644
--- a/e-util/ename/e-address-western.c
+++ b/e-util/ename/e-address-western.c
@@ -32,30 +32,6 @@ static char *extended_keywords[] = {
 };
 
 
-static const gchar *
-e_address_western_strstrcase (const gchar *haystack, const gchar *needle)
-{
-        /* find the needle in the haystack neglecting case */
-        gchar *ptr;
-        guint len;
-
-        g_return_val_if_fail (haystack != NULL, NULL);
-        g_return_val_if_fail (needle != NULL, NULL);
-
-        len = strlen(needle);
-        if (len > strlen(haystack))
-                return NULL;
-
-        if (len == 0)
-                return (char *)haystack;
-
-        for (ptr = (char *)haystack; *(ptr + len - 1) != '\0'; ptr++)
-                if (!g_strncasecmp(ptr, needle, len))
-                        return ptr;
-
-        return NULL;
-}
-
 
 static gboolean
 e_address_western_is_line_blank (gchar *line)
@@ -306,7 +282,7 @@ e_address_western_extract_street (gchar *line, gchar **street, gchar **extended)
 	gint cntr;
 
 	for (cntr = 0; extended_keywords[cntr] != NULL; cntr++) {
-		split = e_address_western_strstrcase (line, extended_keywords[cntr]);
+		split = e_strstrcase (line, extended_keywords[cntr]);
 		if (split != NULL)
 			break;
 	}