callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
svn path=/trunk/; revision=5969
This commit is contained in:
Jesse Pavel
2000-10-17 20:22:43 +00:00
parent e7cb4ceabe
commit 84aca4e2c8
2 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e-util/ChangeLog
View File

@ -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

26
e-util/ename/e-address-western.c
View File

@ -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;
}