aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-07-13 06:59:25 +0800
committerChris Lahey <clahey@src.gnome.org>2000-07-13 06:59:25 +0800
commit5e764dcac939cf6e3386234304bfa1bac862f8cf (patch)
treef0a85caee3a9a46d251e293a7b8cb253411a0630 /camel
parent247366f851afcaff367fcf13c130e3f727566864 (diff)
downloadgsoc2013-evolution-5e764dcac939cf6e3386234304bfa1bac862f8cf.tar
gsoc2013-evolution-5e764dcac939cf6e3386234304bfa1bac862f8cf.tar.gz
gsoc2013-evolution-5e764dcac939cf6e3386234304bfa1bac862f8cf.tar.bz2
gsoc2013-evolution-5e764dcac939cf6e3386234304bfa1bac862f8cf.tar.lz
gsoc2013-evolution-5e764dcac939cf6e3386234304bfa1bac862f8cf.tar.xz
gsoc2013-evolution-5e764dcac939cf6e3386234304bfa1bac862f8cf.tar.zst
gsoc2013-evolution-5e764dcac939cf6e3386234304bfa1bac862f8cf.zip
From addressbook/ChangeLog:
2000-07-12 Christopher James Lahey <clahey@helixcode.com> * backend/pas/pas-backend-file.c: Do case insensitive compares. * addressbook/gui/component/addressbook.c: Make quick search search both name and company name. From camel/ChangeLog: 2000-07-12 Christopher James Lahey <clahey@helixcode.com> * camel-folder-search.c, providers/imap/camel-imap-store.c: Changed from strstrcase to e_strstrcase. * string-utils.c, string-utils.h: Removed strstrcase (in favor of e_strstrcase in e-util/e-util.c.) From e-util/ChangeLog: 2000-07-12 Christopher James Lahey <clahey@helixcode.com> * e-util.c, e-util.h: Added e_strstrcase function. svn path=/trunk/; revision=4127
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog8
-rw-r--r--camel/camel-folder-search.c2
-rw-r--r--camel/providers/imap/camel-imap-store.c8
-rw-r--r--camel/string-utils.c21
-rw-r--r--camel/string-utils.h2
5 files changed, 13 insertions, 28 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index dba02a52a5..83f4a923bd 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-12 Christopher James Lahey <clahey@helixcode.com>
+
+ * camel-folder-search.c, providers/imap/camel-imap-store.c:
+ Changed from strstrcase to e_strstrcase.
+
+ * string-utils.c, string-utils.h: Removed strstrcase (in favor of
+ e_strstrcase in e-util/e-util.c.)
+
2000-07-12 Chris Toshok <toshok@helixcode.com>
* providers/nntp/camel-nntp-folder.c
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 583316d50f..4e77aea94e 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -381,7 +381,7 @@ search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, C
/* performs an OR of all words */
for (i=1;i<argc && !truth;i++) {
if (argv[i]->type == ESEXP_RES_STRING
- && strstrcase(header, argv[i]->value.string)) {
+ && e_strstrcase(header, argv[i]->value.string)) {
r(printf("%s got a match with %s of %s\n", search->current->uid, header, argv[i]->value.string));
truth = TRUE;
break;
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index eeb7bd7d90..d31080d0b2 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -333,7 +333,7 @@ imap_connect (CamelService *service, CamelException *ex)
"Unknown error");
}
- if (strstrcase (result, "SEARCH"))
+ if (e_strstrcase (result, "SEARCH"))
store->has_search_capability = TRUE;
else
store->has_search_capability = FALSE;
@@ -559,13 +559,13 @@ camel_imap_command (CamelImapStore *store, CamelFolder *folder, char **ret, char
}
if (p) {
- if (strstrcase (p, "READ-WRITE"))
+ if (e_strstrcase (p, "READ-WRITE"))
mode =
}
#endif
}
#if 0
- if ((recent = strstrcase (r, "RECENT"))) {
+ if ((recent = e_strstrcase (r, "RECENT"))) {
char *p;
for (p = recent; p > r && *p != '*'; p--);
@@ -678,7 +678,7 @@ camel_imap_command_extended (CamelImapStore *store, CamelFolder *folder, char **
return s;
}
#if 0
- if ((recent = strstrcase (r, "RECENT"))) {
+ if ((recent = e_strstrcase (r, "RECENT"))) {
char *p;
for (p = recent; p > r && *p != '*'; p--);
diff --git a/camel/string-utils.c b/camel/string-utils.c
index 8c46df7a60..418092fd06 100644
--- a/camel/string-utils.c
+++ b/camel/string-utils.c
@@ -174,24 +174,3 @@ string_prefix (const gchar *s, const gchar *suffix, gboolean *suffix_found)
return result_string;
}
-
-gchar *
-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;
-
- for (ptr = (char *)haystack; *(ptr + len - 1) != '\0'; ptr++)
- if (!g_strncasecmp(ptr, needle, len))
- return ptr;
-
- return NULL;
-}
diff --git a/camel/string-utils.h b/camel/string-utils.h
index fa6297a5e1..6f5b9a577c 100644
--- a/camel/string-utils.h
+++ b/camel/string-utils.h
@@ -56,8 +56,6 @@ void string_trim (gchar *string, const gchar *chars,
gchar *string_prefix (const gchar *s, const gchar *suffix, gboolean *suffix_found);
-gchar *strstrcase (const gchar *haystack, const gchar *needle);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */